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/18 23:00:47 UTC
svn commit: r1504658 - in /incubator/jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/auth/
jspwiki-war/src/main/java/org/apache/wiki/auth/ac...
Author: gmazza
Date: Thu Jul 18 21:00:46 2013
New Revision: 1504658
URL: http://svn.apache.org/r1504658
Log:
About 70 Sonar complaints fixed.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.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/GroupPrincipal.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/WikiPrincipal.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WorkflowEvent.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GroupCommand.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/PageCommand.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/RedirectCommand.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiCommand.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Jul 18 21:00:46 2013
@@ -1,3 +1,9 @@
+2013-07-18 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-20
+
+ * Some Sonar fixes on minor matters.
+
2013-07-15 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-19
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=1504658&r1=1504657&r2=1504658&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 Thu Jul 18 21:00:46 2013
@@ -4,7 +4,7 @@ Title: Changelog
* 2.10.0-svn-19
-* Minor amount of Sonar complaints removed regarding redundant final declarations within
+* Some Sonar complaints removed regarding redundant final declarations within
final classes.
#### 2013-07-14 Glen Mazza (gmazza AT apache DOT org)
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java Thu Jul 18 21:00:46 2013
@@ -184,7 +184,7 @@ public final class PropertyReader
*
* @return The default property set.
*/
- public static final Properties getDefaultProperties()
+ public static Properties getDefaultProperties()
{
Properties props = new Properties( TextUtil.createProperties( DEFAULT_PROPERTIES ) );
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=1504658&r1=1504657&r2=1504658&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 Thu Jul 18 21:00:46 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 = "19";
+ public static final String BUILD = "20";
/**
* This is the generic version string you should use
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=1504658&r1=1504657&r2=1504658&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 Thu Jul 18 21:00:46 2013
@@ -236,7 +236,7 @@ public final class AuthorizationManager
log.debug( "Checking ACL entries..." );
log.debug( "Acl for this page is: " + acl );
- log.debug( "Checking for principal: " + String.valueOf( aclPrincipals ) );
+ log.debug( "Checking for principal: " + aclPrincipals );
log.debug( "Permission: " + permission );
for( Principal aclPrincipal : aclPrincipals )
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/GroupPrincipal.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/GroupPrincipal.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/GroupPrincipal.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/GroupPrincipal.java Thu Jul 18 21:00:46 2013
@@ -55,7 +55,7 @@ public final class GroupPrincipal implem
* @return the name
* @see java.security.Principal#getName()
*/
- public final String getName()
+ public String getName()
{
return m_name;
}
@@ -66,7 +66,7 @@ public final class GroupPrincipal implem
* @return the result of the equality test
* @see java.lang.Object#equals(java.lang.Object)
*/
- public final boolean equals( Object obj )
+ public boolean equals( Object obj )
{
if ( !( obj instanceof GroupPrincipal ) )
{
@@ -81,7 +81,7 @@ public final class GroupPrincipal implem
* @return the hash code
* @see java.lang.Object#hashCode()
*/
- public final int hashCode()
+ public int hashCode()
{
return m_name.hashCode();
}
@@ -91,7 +91,7 @@ public final class GroupPrincipal implem
* @return the string
* @see java.lang.Object#toString()
*/
- public final String toString()
+ public String toString()
{
return "[GroupPrincipal " + m_name + "]";
}
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=1504658&r1=1504657&r2=1504658&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 Thu Jul 18 21:00:46 2013
@@ -191,7 +191,7 @@ public final class SecurityVerifier
String colWidth;
if ( pageActions.length > 0 && roles.length > 0 )
{
- colWidth = String.valueOf( 67f / ( pageActions.length * roles.length ) ) + "%";
+ colWidth = (67f / ( pageActions.length * roles.length )) + "%";
}
else
{
@@ -536,7 +536,7 @@ public final class SecurityVerifier
}
// Try adding a bogus group with random name
- String name = "TestGroup" + String.valueOf( System.currentTimeMillis() );
+ String name = "TestGroup" + System.currentTimeMillis();
Group group = null;
try
{
@@ -861,7 +861,7 @@ public final class SecurityVerifier
}
// Try adding a bogus user with random name
- String loginName = "TestUser" + String.valueOf( System.currentTimeMillis() );
+ String loginName = "TestUser" + System.currentTimeMillis();
try
{
UserProfile profile = db.newProfile();
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/WikiPrincipal.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/WikiPrincipal.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/WikiPrincipal.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/WikiPrincipal.java Thu Jul 18 21:00:46 2013
@@ -112,7 +112,7 @@ public final class WikiPrincipal impleme
* Returns the wiki name of the Principal.
* @return the name
*/
- public final String getName()
+ public String getName()
{
return m_name;
}
@@ -123,7 +123,7 @@ public final class WikiPrincipal impleme
* @param obj the object to compare
* @return the result of the equality test
*/
- public final boolean equals( Object obj )
+ public boolean equals( Object obj )
{
if ( obj == null || !( obj instanceof WikiPrincipal ) )
{
@@ -137,7 +137,7 @@ public final class WikiPrincipal impleme
* for its name.
* @return the hash code
*/
- public final int hashCode()
+ public int hashCode()
{
return m_name.hashCode();
}
@@ -147,7 +147,7 @@ public final class WikiPrincipal impleme
* {@link #WIKI_NAME} or {@link #WIKI_NAME}
* @return the type
*/
- public final String getType()
+ public String getType()
{
return m_type;
}
@@ -156,7 +156,7 @@ public final class WikiPrincipal impleme
* Returns a human-readable representation of the object.
* @return the string representation
*/
- public final String toString()
+ public String toString()
{
return "[WikiPrincipal (" + m_type + "): " + getName() + "]";
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java Thu Jul 18 21:00:46 2013
@@ -52,7 +52,7 @@ public final class UnresolvedPrincipal i
* @return the name
* @see java.security.Principal#getName()
*/
- public final String getName()
+ public String getName()
{
return m_name;
}
@@ -61,7 +61,7 @@ public final class UnresolvedPrincipal i
* Returns a String representation of the UnresolvedPrincipal.
* @return the String
*/
- public final String toString()
+ public String toString()
{
return "[UnresolvedPrincipal: " + m_name + "]";
}
@@ -73,7 +73,7 @@ public final class UnresolvedPrincipal i
* @return the result of the equality test
* @see java.lang.Object#equals(java.lang.Object)
*/
- public final boolean equals( Object obj )
+ public boolean equals( Object obj )
{
if ( obj instanceof UnresolvedPrincipal )
{
@@ -86,7 +86,7 @@ public final class UnresolvedPrincipal i
* The hashCode of this object is equal to the hash code of its name.
* @return the hash code
*/
- public final int hashCode()
+ public int hashCode()
{
return m_name.hashCode();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java Thu Jul 18 21:00:46 2013
@@ -239,7 +239,7 @@ public abstract class AbstractLoginModul
* <code>false</code> otherwise.
* @return True, if a login has succeeded.
*/
- private final boolean succeeded()
+ private boolean succeeded()
{
return m_principals.size() > 0;
}
@@ -249,7 +249,7 @@ public abstract class AbstractLoginModul
* Principal set.
* @param principals the principals to remove
*/
- private final void removePrincipals( Collection<Principal> principals )
+ private void removePrincipals( Collection<Principal> principals )
{
for ( Principal principal : principals )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java Thu Jul 18 21:00:46 2013
@@ -43,7 +43,7 @@ public final class PrincipalWrapper impl
* Returns the wrapped Principal used to construct this instance.
* @return the wrapped Principal decorated by this instance.
*/
- public final Principal getPrincipal()
+ public Principal getPrincipal()
{
return m_principal;
}
@@ -53,7 +53,7 @@ public final class PrincipalWrapper impl
*
* @return The name of the wrapped principal.
*/
- public final String getName()
+ public String getName()
{
return m_principal.getName();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java Thu Jul 18 21:00:46 2013
@@ -55,7 +55,7 @@ public final class WebContainerCallbackH
*
* {@inheritDoc}
*/
- public final void handle( Callback[] callbacks ) throws IOException, UnsupportedCallbackException
+ public void handle( Callback[] callbacks ) throws IOException, UnsupportedCallbackException
{
for( int i = 0; i < callbacks.length; i++ )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java Thu Jul 18 21:00:46 2013
@@ -49,7 +49,7 @@ public final class PermissionFactory
* @param actions A list of actions.
* @return A PagePermission object, presenting this page+actions combination.
*/
- public static final PagePermission getPagePermission( WikiPage page, String actions )
+ public static PagePermission getPagePermission( WikiPage page, String actions )
{
return getPagePermission( page.getWiki(), page.getName(), actions );
}
@@ -61,7 +61,7 @@ public final class PermissionFactory
* @param actions A list of actions.
* @return A PagePermission object, presenting this page+actions combination.
*/
- public static final PagePermission getPagePermission( String page, String actions )
+ public static PagePermission getPagePermission( String page, String actions )
{
return getPagePermission( "", page, actions );
}
@@ -74,7 +74,7 @@ public final class PermissionFactory
* @param actions A list of actions.
* @return A PagePermission object.
*/
- private static final PagePermission getPagePermission( String wiki, String page, String actions )
+ private static PagePermission getPagePermission( String wiki, String page, String actions )
{
PagePermission perm;
//
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventManager.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventManager.java Thu Jul 18 21:00:46 2013
@@ -217,7 +217,7 @@ public final class WikiEventManager
* @param listener the event listener
* @return true if the listener was added (i.e., it was not already in the list and was added)
*/
- public static final boolean addWikiEventListener(
+ public static boolean addWikiEventListener(
Object client, WikiEventListener listener )
{
if ( client == WikiEventManager.class )
@@ -238,7 +238,7 @@ public final class WikiEventManager
* @param listener the event listener
* @return true if the listener was found and removed.
*/
- public static final boolean removeWikiEventListener(
+ public static boolean removeWikiEventListener(
Object client, WikiEventListener listener )
{
if ( client == WikiEventManager.class )
@@ -272,7 +272,7 @@ public final class WikiEventManager
* @return an unmodifiable Set containing the WikiEventListeners attached to the client
* @throws java.lang.UnsupportedOperationException if any attempt is made to modify the Set
*/
- public static final Set getWikiEventListeners( Object client )
+ public static Set getWikiEventListeners( Object client )
throws UnsupportedOperationException
{
WikiEventDelegate delegate = getInstance().getDelegateFor(client);
@@ -289,7 +289,7 @@ public final class WikiEventManager
* @param listener the event listener
* @return true if the listener was found and removed.
*/
- public static final boolean removeWikiEventListener( WikiEventListener listener )
+ public static boolean removeWikiEventListener( WikiEventListener listener )
{
// get the Map.entry object for the entire Map, then check match on entry (listener)
WikiEventManager mgr = getInstance();
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java Thu Jul 18 21:00:46 2013
@@ -185,7 +185,7 @@ public final class WikiSecurityEvent ext
* <em>— and calling methods should check for this condition</em>.
* @return the changed object
*/
- public final Object getPrincipal()
+ public Object getPrincipal()
{
return m_principal;
}
@@ -196,7 +196,7 @@ public final class WikiSecurityEvent ext
* <em>— and calling methods should check for this condition</em>.
* @return the changed object
*/
- public final Object getTarget()
+ public Object getTarget()
{
return m_target;
}
@@ -205,7 +205,7 @@ public final class WikiSecurityEvent ext
* Prints a String (human-readable) representation of this object.
* @see java.lang.Object#toString()
*/
- public final String toString()
+ public String toString()
{
StringBuffer msg = new StringBuffer();
msg.append( "WikiSecurityEvent." );
@@ -227,7 +227,7 @@ public final class WikiSecurityEvent ext
* @param type the type
* @return the string representation
*/
- public final String eventName( int type )
+ public String eventName( int type )
{
switch( type )
{
@@ -254,7 +254,7 @@ public final class WikiSecurityEvent ext
*
* @return a String description of the type
*/
- public final String getTypeDescription()
+ public String getTypeDescription()
{
switch ( getType() )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WorkflowEvent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WorkflowEvent.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WorkflowEvent.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WorkflowEvent.java Thu Jul 18 21:00:46 2013
@@ -94,7 +94,7 @@ public final class WorkflowEvent extends
* @deprecated will be removed in 2.10 scope. Consider using {@link WikiEvent#getSrc()} instead
*/
@Deprecated
- public final Workflow getWorkflow()
+ public Workflow getWorkflow()
{
return (Workflow) super.getSrc();
}
@@ -104,7 +104,7 @@ public final class WorkflowEvent extends
*
* @see java.lang.Object#toString()
*/
- public final String toString()
+ public String toString()
{
StringBuffer msg = new StringBuffer();
msg.append("WorkflowEvent.");
@@ -122,7 +122,7 @@ public final class WorkflowEvent extends
* the type
* @return the string representation
*/
- public final String eventName(int type)
+ public String eventName(int type)
{
switch (type)
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java Thu Jul 18 21:00:46 2013
@@ -714,7 +714,7 @@ public class JSPWikiMarkupParser
"hr", "noscript", "ol", "p", "pre", "table", "ul"
};
- private static final boolean isBlockLevel( String name )
+ private static boolean isBlockLevel( String name )
{
return Arrays.binarySearch( BLOCK_ELEMENTS, name ) >= 0;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java Thu Jul 18 21:00:46 2013
@@ -84,7 +84,7 @@ public class Image
* This method is used to clean away things like quotation marks which
* a malicious user could use to stop processing and insert javascript.
*/
- private static final String getCleanParameter( Map<String, String> params, String paramId )
+ private static String getCleanParameter( Map<String, String> params, String paramId )
{
return TextUtil.replaceEntities( params.get( paramId ) );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java Thu Jul 18 21:00:46 2013
@@ -282,7 +282,7 @@ public class CachingAttachmentProvider
* @return The newly fetched object from the provider.
*/
@SuppressWarnings("unchecked")
- private final Collection<Attachment> refresh( WikiPage page )
+ private Collection<Attachment> refresh( WikiPage page )
throws ProviderException
{
m_cacheMisses++;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java Thu Jul 18 21:00:46 2013
@@ -198,8 +198,7 @@ public class CachingProvider
private WikiPage getPageInfoFromCache( String name )
- throws ProviderException,
- RepositoryModifiedException
+ throws ProviderException
{
boolean wasUpdated = false;
// Sanity check; seems to occur sometimes
@@ -474,8 +473,7 @@ public class CachingProvider
* @throws RepositoryModifiedException If the page has been externally modified.
*/
public String getPageText( String pageName, int version )
- throws ProviderException,
- RepositoryModifiedException
+ throws ProviderException
{
String result = null;
@@ -510,8 +508,7 @@ public class CachingProvider
* @throws RepositoryModifiedException If the page has been externally modified.
*/
private String getTextFromCache( String pageName )
- throws ProviderException,
- RepositoryModifiedException
+ throws ProviderException
{
String text;
boolean wasUpdated = false;
@@ -699,8 +696,7 @@ public class CachingProvider
* {@inheritDoc}
*/
public WikiPage getPageInfo( String pageName, int version )
- throws ProviderException,
- RepositoryModifiedException
+ throws ProviderException
{
WikiPage page = null;
WikiPage cached = getPageInfoFromCache( pageName );
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java Thu Jul 18 21:00:46 2013
@@ -218,7 +218,7 @@ public class AtomFeed extends Feed
}
}
- private final Element getElement( String name )
+ private Element getElement( String name )
{
return new Element( name, m_atomNameSpace );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GroupCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GroupCommand.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GroupCommand.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GroupCommand.java Thu Jul 18 21:00:46 2013
@@ -85,7 +85,7 @@ public final class GroupCommand extends
* @param target the GroupPrincipal to combine into the current Command
* @return the new, targeted command
*/
- public final Command targetedCommand( Object target )
+ public Command targetedCommand( Object target )
{
if ( !( target != null && target instanceof GroupPrincipal ) )
{
@@ -100,7 +100,7 @@ public final class GroupCommand extends
* @return the name
* @see org.apache.wiki.ui.Command#getName()
*/
- public final String getName()
+ public String getName()
{
Object target = getTarget();
if ( target == null )
@@ -115,7 +115,7 @@ public final class GroupCommand extends
* @return the permission
* @see org.apache.wiki.ui.Command#requiredPermission()
*/
- public final Permission requiredPermission()
+ public Permission requiredPermission()
{
return m_permission;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java Thu Jul 18 21:00:46 2013
@@ -84,7 +84,7 @@ public final class InputValidator
* @return returns <code>true</code> if valid, <code>false</code>
* otherwise
*/
- public final boolean validateNotNull( String input, String label )
+ public boolean validateNotNull( String input, String label )
{
return validateNotNull( input, label, STANDARD );
}
@@ -99,7 +99,7 @@ public final class InputValidator
* @return returns <code>true</code> if valid, <code>false</code>
* otherwise
*/
- public final boolean validateNotNull( String input, String label, int type )
+ public boolean validateNotNull( String input, String label, int type )
{
if ( isBlank( input ) )
{
@@ -123,7 +123,7 @@ public final class InputValidator
* @return returns <code>true</code> if valid, <code>false</code>
* otherwise
*/
- public final boolean validate( String input, String label, int type )
+ public boolean validate( String input, String label, int type )
{
// If blank, it's valid
if ( isBlank( input ) )
@@ -180,7 +180,7 @@ public final class InputValidator
* @return <code>true</code> if <code>null</code> or blank (zero-length);
* <code>false</code> otherwise
*/
- public static final boolean isBlank( String input )
+ public static boolean isBlank( String input )
{
return input == null || input.trim().length() < 1;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/PageCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/PageCommand.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/PageCommand.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/PageCommand.java Thu Jul 18 21:00:46 2013
@@ -114,7 +114,7 @@ public final class PageCommand extends A
* @return the new targeted command
* @throws IllegalArgumentException if the target is not of the correct type
*/
- public final Command targetedCommand( Object target )
+ public Command targetedCommand( Object target )
{
if( !( target != null && target instanceof WikiPage ) )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/RedirectCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/RedirectCommand.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/RedirectCommand.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/RedirectCommand.java Thu Jul 18 21:00:46 2013
@@ -66,7 +66,7 @@ public final class RedirectCommand exten
* @param target the object to combine
* @throws IllegalArgumentException if the target is not of the correct type
*/
- public final Command targetedCommand( Object target )
+ public Command targetedCommand( Object target )
{
if ( !( target != null && target instanceof String ) )
{
@@ -78,7 +78,7 @@ public final class RedirectCommand exten
/**
* @see org.apache.wiki.ui.Command#getName()
*/
- public final String getName()
+ public String getName()
{
Object target = getTarget();
if ( target == null )
@@ -92,7 +92,7 @@ public final class RedirectCommand exten
* No-op; always returns <code>null</code>.
* @see org.apache.wiki.ui.Command#requiredPermission()
*/
- public final Permission requiredPermission()
+ public Permission requiredPermission()
{
return null;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java Thu Jul 18 21:00:46 2013
@@ -239,7 +239,7 @@ public class TemplateManager
/**
* Removes the template part of a name.
*/
- private static final String removeTemplatePart( String name )
+ private static String removeTemplatePart( String name )
{
int idx = 0;
if( name.startsWith( "/" ) ) idx = 1;
@@ -266,7 +266,7 @@ public class TemplateManager
* @param name The name of the resource.
* @return The full name for a template.
*/
- private static final String makeFullJSPName( String template, String name )
+ private static String makeFullJSPName( String template, String name )
{
return "/"+DIRECTORY+"/"+template+"/"+name;
}
@@ -364,7 +364,7 @@ public class TemplateManager
/**
* Returns an absolute path to a given template.
*/
- private static final String getPath( String template )
+ private static String getPath( String template )
{
return "/"+DIRECTORY+"/"+template+"/";
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiCommand.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiCommand.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiCommand.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiCommand.java Thu Jul 18 21:00:46 2013
@@ -125,7 +125,7 @@ public final class WikiCommand extends A
* @return the new targeted command
* @throws IllegalArgumentException if the target is not of the correct type
*/
- public final Command targetedCommand( Object target )
+ public Command targetedCommand( Object target )
{
if ( !( target != null && target instanceof String ) )
{
@@ -138,7 +138,7 @@ public final class WikiCommand extends A
* Always returns the "friendly" JSP name.
* @see org.apache.wiki.ui.Command#getName()
*/
- public final String getName()
+ public String getName()
{
return getJSPFriendlyName();
}
@@ -146,7 +146,7 @@ public final class WikiCommand extends A
/**
* @see org.apache.wiki.ui.Command#requiredPermission()
*/
- public final Permission requiredPermission()
+ public Permission requiredPermission()
{
return m_permission;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java Thu Jul 18 21:00:46 2013
@@ -123,7 +123,7 @@ public class DefaultURLConstructor
*
* We also convert any %2F's back to slashes to make nicer-looking URLs.
*/
- private final String encodeURI( String uri )
+ private String encodeURI( String uri )
{
uri = m_engine.encodeName(uri);
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java Thu Jul 18 21:00:46 2013
@@ -303,7 +303,7 @@ public final class TextUtil
* @param dest The string to replace <I>src</I> with.
* @return A string with the replacement done.
*/
- public static final String replaceString( String orig, String src, String dest )
+ public static String replaceString( String orig, String src, String dest )
{
if ( orig == null ) return null;
if ( src == null || dest == null ) throw new NullPointerException();
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleNotification.java?rev=1504658&r1=1504657&r2=1504658&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleNotification.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleNotification.java Thu Jul 18 21:00:46 2013
@@ -69,7 +69,7 @@ public final class SimpleNotification ex
* <code>false</code>.
* @return <code>false</code> always
*/
- public final boolean isReassignable()
+ public boolean isReassignable()
{
return false;
}