Author: gmazza
Date: Mon Jul 22 01:43:18 2013
New Revision: 1505582

URL: http://svn.apache.org/r1505582
Log:
Some Sonar complaints fixed.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/planet/business/Planet.java
    
roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/BookmarkManager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/OAuthManager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/RefererManager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarModel.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/planet/business/Planet.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/Planet.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/planet/business/Planet.java 
(original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/planet/business/Planet.java 
Mon Jul 22 01:43:18 2013
@@ -31,49 +31,49 @@ public interface Planet {
     /**
      * Get PlanetManager associated with this Roller instance.
      */
-    public PlanetManager getWebloggerManager();
+     PlanetManager getWebloggerManager();
     
     
     /**
      * Get PropertiesManager.
      */
-    public PropertiesManager getPropertiesManager();
+    PropertiesManager getPropertiesManager();
     
     
     /**
      * Get the configured URLStrategy.
      */
-    public PlanetURLStrategy getURLStrategy();
+    PlanetURLStrategy getURLStrategy();
     
     
     /**
      * Get the configured FeedFetcher.
      */
-    public FeedFetcher getFeedFetcher();
+    FeedFetcher getFeedFetcher();
     
         
     /**
      * Flush object states.
      */
-    public void flush() throws RollerException;
+    void flush() throws RollerException;
     
     
     /**
      * Initialize any resources necessary for this instance of Roller.
      */
-    public void initialize() throws Exception;
+    void initialize() throws Exception;
     
 
     /**
      * Release any resources associated with a session.
      */
-    public void release();
+    void release();
     
     
     /**
      * Shutdown the application.
      */
-    public void shutdown();
+    void shutdown();
     
 }
 

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetURLStrategy.java
 Mon Jul 22 01:43:18 2013
@@ -35,7 +35,7 @@ public interface PlanetURLStrategy {
      * @param planetHandle The 'handle' of the planet being referenced.
      * @returns The url to the planet.
      */
-    public String getPlanetURL(String planetHandle);
+    String getPlanetURL(String planetHandle);
     
     
     /**
@@ -46,7 +46,7 @@ public interface PlanetURLStrategy {
      * @param pageNum The page number.
      * @returns The url to the planet group.
      */
-    public String getPlanetGroupURL(String planetHandle, String groupHandle, 
int pageNum);
+    String getPlanetGroupURL(String planetHandle, String groupHandle, int 
pageNum);
     
     
     /**
@@ -57,7 +57,7 @@ public interface PlanetURLStrategy {
      * @param format The feed format being requested.
      * @returns The url to the feed.
      */
-    public String getPlanetGroupFeedURL(String planetHandle, String 
groupHandle, String format);
+    String getPlanetGroupFeedURL(String planetHandle, String groupHandle, 
String format);
     
     
     /**
@@ -67,24 +67,24 @@ public interface PlanetURLStrategy {
      * @param groupHandle The 'hadle' of the planet group being referenced.
      * @returns The url to the feed.
      */
-    public String getPlanetGroupOpmlURL(String planetHandle, String 
groupHandle);
+    String getPlanetGroupOpmlURL(String planetHandle, String groupHandle);
     
     
     /**
      * Compose a map of key=value params into a query string.
      */
-    public String getQueryString(Map params);
+    String getQueryString(Map params);
     
     
     /**
      * URL encode a string.
      */
-    public String encode(String str);
+    String encode(String str);
     
     
     /**
      * URL decode a string.
      */
-    public String decode(String str);
+    String decode(String str);
     
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/BookmarkManager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/BookmarkManager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/BookmarkManager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/BookmarkManager.java
 Mon Jul 22 01:43:18 2013
@@ -41,7 +41,7 @@ public interface BookmarkManager {
      * @param folder The folder to be saved.
      * @throws WebloggerException If there is a problem.
      */
-    public void saveFolder(WeblogBookmarkFolder folder) throws 
WebloggerException;
+    void saveFolder(WeblogBookmarkFolder folder) throws WebloggerException;
     
     
     /**
@@ -52,7 +52,7 @@ public interface BookmarkManager {
      * @param folder The folder to be removed.
      * @throws WebloggerException If there is a problem.
      */
-    public void removeFolder(WeblogBookmarkFolder folder) throws 
WebloggerException;
+    void removeFolder(WeblogBookmarkFolder folder) throws WebloggerException;
     
     
     /**
@@ -60,7 +60,7 @@ public interface BookmarkManager {
      *
      * This moves the src folder itself and all children and associated 
bookmarks.
      */
-    public void moveFolder(WeblogBookmarkFolder src,
+    void moveFolder(WeblogBookmarkFolder src,
 
     WeblogBookmarkFolder dest
 )
@@ -74,7 +74,7 @@ public interface BookmarkManager {
      * @return FolderData The folder, or null if not found.
      * @throws WebloggerException If there is a problem.
      */
-    public WeblogBookmarkFolder getFolder(String id) throws WebloggerException;
+    WeblogBookmarkFolder getFolder(String id) throws WebloggerException;
     
     
     /** 
@@ -84,7 +84,7 @@ public interface BookmarkManager {
      * @return List The list of FolderData objects from the weblog.
      * @throws WebloggerException If there is a problem.
      */
-    public List getAllFolders(Weblog weblog) throws WebloggerException;
+    List getAllFolders(Weblog weblog) throws WebloggerException;
     
     
     /** 
@@ -95,7 +95,7 @@ public interface BookmarkManager {
      * @return FolderData The root folder, or null if not found.
      * @throws WebloggerException If there is a problem.
      */
-    public WeblogBookmarkFolder getRootFolder(Weblog weblog) throws 
WebloggerException;
+    WeblogBookmarkFolder getRootFolder(Weblog weblog) throws 
WebloggerException;
     
     
     /** 
@@ -106,7 +106,7 @@ public interface BookmarkManager {
      * @return FolderData The folder from the given path, or null if not found.
      * @throws WebloggerException If there is a problem.
      */
-    public WeblogBookmarkFolder getFolder(Weblog weblog, String path)
+    WeblogBookmarkFolder getFolder(Weblog weblog, String path)
             throws WebloggerException;
     
     
@@ -116,7 +116,7 @@ public interface BookmarkManager {
      * @param bookmark The bookmark to be saved.
      * @throws WebloggerException If there is a problem.
      */
-    public void saveBookmark(WeblogBookmark bookmark) throws 
WebloggerException;
+    void saveBookmark(WeblogBookmark bookmark) throws WebloggerException;
     
     
     /**
@@ -125,7 +125,7 @@ public interface BookmarkManager {
      * @param bookmark The bookmark to be removed.
      * @throws WebloggerException If there is a problem.
      */
-    public void removeBookmark(WeblogBookmark bookmark) throws 
WebloggerException;
+    void removeBookmark(WeblogBookmark bookmark) throws WebloggerException;
     
     
     /** 
@@ -135,7 +135,7 @@ public interface BookmarkManager {
      * @return BookmarkData The bookmark, or null if not found.
      * @throws WebloggerException If there is a problem.
      */
-    public WeblogBookmark getBookmark(String id) throws WebloggerException;
+    WeblogBookmark getBookmark(String id) throws WebloggerException;
     
     
     /** 
@@ -146,7 +146,7 @@ public interface BookmarkManager {
      * @return List The list of bookmarks found.
      * @throws WebloggerException If there is a problem.
      */
-    public List getBookmarks(WeblogBookmarkFolder folder, boolean recurse)
+    List getBookmarks(WeblogBookmarkFolder folder, boolean recurse)
             throws WebloggerException;
     
     
@@ -157,13 +157,13 @@ public interface BookmarkManager {
      * @param folder The NEW folder name to import the OPML into.
      * @param opml OPML data to be imported.
      */
-    public void importBookmarks(Weblog weblog, String folder, String opml)
+    void importBookmarks(Weblog weblog, String folder, String opml)
             throws WebloggerException;
     
     
     /**
      * Release all resources associated with Roller session.
      */
-    public void release();
+    void release();
     
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManager.java
 Mon Jul 22 01:43:18 2013
@@ -40,7 +40,7 @@ public interface FileContentManager {
      * @throws FileNotFoundException If path does not exist.
      * @throws FilePathException If path is invalid, or can't be read.
      */
-    public FileContent getFileContent(Weblog weblog, String fileId)
+    FileContent getFileContent(Weblog weblog, String fileId)
             throws FileNotFoundException, FilePathException;
 
     /**
@@ -54,7 +54,7 @@ public interface FileContentManager {
      * @throws FilePathException If path is invalid, is not a directory, or 
can't be read.
      * @throws FileIOException If there is an unexpected error during the save.
      */
-    public void saveFileContent(Weblog weblog,
+    void saveFileContent(Weblog weblog,
             String fileId,
             InputStream is)
             throws FileNotFoundException, FilePathException, FileIOException;
@@ -69,7 +69,7 @@ public interface FileContentManager {
      * @throws FilePathException If path is invalid, or can't be read.
      * @throws FileIOException If there is an unexpected error during the 
delete.
      */
-    public void deleteFile(Weblog weblog, String fileId)
+    void deleteFile(Weblog weblog, String fileId)
             throws FileNotFoundException, FilePathException, FileIOException;
 
     /**
@@ -80,7 +80,7 @@ public interface FileContentManager {
      * @param weblog The weblog to delete all files from.
      * @throws FileIOException If there is an unexpected error during the 
delete.
      */
-    public void deleteAllFiles(Weblog weblog)
+    void deleteAllFiles(Weblog weblog)
             throws FileIOException;
 
     /** 
@@ -89,7 +89,7 @@ public interface FileContentManager {
      * @param weblog The weblog we are working on.
      * @return True if weblog is over set quota, False otherwise.
      */
-    public boolean overQuota(Weblog weblog);
+    boolean overQuota(Weblog weblog);
 
     /**
      * Determine if file can be saved given current WebloggerConfig settings.
@@ -101,7 +101,7 @@ public interface FileContentManager {
      * @param messages output parameter for adding messages.
      * @return true if the file can be saved, false otherwise. 
      */
-    public boolean canSave(Weblog weblog,
+    boolean canSave(Weblog weblog,
             String fileName,
             String contentType,
             long size,
@@ -110,6 +110,6 @@ public interface FileContentManager {
     /**
      * Release all resources associated with Roller session.
      */
-    public void release();
+    void release();
 
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/OAuthManager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/OAuthManager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/OAuthManager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/OAuthManager.java
 Mon Jul 22 01:43:18 2013
@@ -36,42 +36,42 @@ public interface OAuthManager {
     /**
      * Get validator to be used to OAuth validate messages.
      */
-    public OAuthServiceProvider getServiceProvider();
+    OAuthServiceProvider getServiceProvider();
 
     /**
      * Get validator to be used to OAuth validate messages.
      */
-    public OAuthValidator getValidator();
+    OAuthValidator getValidator();
 
     /**
      * Get the site-wide consumer.
      */
-    public OAuthConsumer getConsumer()
+    OAuthConsumer getConsumer()
             throws WebloggerException;
 
     /**
      * Get consumer corresponding to request.
      */
-    public OAuthConsumer getConsumerByUsername(String username)
+    OAuthConsumer getConsumerByUsername(String username)
             throws WebloggerException;
 
     /**
      * Get consumer corresponding to request.
      */
-    public OAuthConsumer getConsumer(
+    OAuthConsumer getConsumer(
             OAuthMessage requestMessage)
             throws IOException, OAuthProblemException;
 
     /**
      * Add a site-wide consumer provided a key, there can only be one.
      */
-    public OAuthConsumer addConsumer(String consumerKey)
+    OAuthConsumer addConsumer(String consumerKey)
             throws OAuthException, WebloggerException;
 
     /**
      * Store a new consumer for specified user, each user can have only one.
      */
-    public OAuthConsumer addConsumer(String username, String consumerKey)
+    OAuthConsumer addConsumer(String username, String consumerKey)
             throws OAuthException;
 
     /**
@@ -84,13 +84,13 @@ public interface OAuthManager {
      * @throws OAuthProblemException If provided token is bad
      * @throws java.io.IOException on IO error
      */
-    public OAuthAccessor getAccessor(OAuthMessage requestMessage)
+    OAuthAccessor getAccessor(OAuthMessage requestMessage)
             throws IOException, OAuthProblemException;
 
     /**
      * Set the access token 
      */
-    public void markAsAuthorized(OAuthAccessor accessor, String userId)
+    void markAsAuthorized(OAuthAccessor accessor, String userId)
             throws OAuthException;    
 
     /**
@@ -98,7 +98,7 @@ public interface OAuthManager {
      * 
      * @throws OAuthException
      */
-    public void generateRequestToken(
+    void generateRequestToken(
             OAuthAccessor accessor)
             throws OAuthException;
     
@@ -107,6 +107,6 @@ public interface OAuthManager {
      * 
      * @throws OAuthException
      */
-    public void generateAccessToken(OAuthAccessor accessor)
+    void generateAccessToken(OAuthAccessor accessor)
             throws OAuthException;
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
 Mon Jul 22 01:43:18 2013
@@ -39,7 +39,7 @@ public interface AutoPingManager {
      * @param autoPing the auto ping configuration
      * @throws WebloggerException
      */
-    public void saveAutoPing(AutoPing autoPing) throws WebloggerException;
+    void saveAutoPing(AutoPing autoPing) throws WebloggerException;
     
     
     /**
@@ -48,7 +48,7 @@ public interface AutoPingManager {
      * @param autoPing the auto ping configuration to remove
      * @throws WebloggerException
      */
-    public void removeAutoPing(AutoPing autoPing) throws WebloggerException;
+    void removeAutoPing(AutoPing autoPing) throws WebloggerException;
     
     
     /**
@@ -59,7 +59,7 @@ public interface AutoPingManager {
      * @param website    the website
      * @throws WebloggerException
      */
-    public void removeAutoPing(PingTarget pingTarget, Weblog website) throws 
WebloggerException;
+    void removeAutoPing(PingTarget pingTarget, Weblog website) throws 
WebloggerException;
     
     
     /**
@@ -68,7 +68,7 @@ public interface AutoPingManager {
      * @param autopings a <code>Collection</code> of <code>AAutoPing/code> 
objects
      * @throws WebloggerException
      */
-    public void removeAutoPings(Collection autopings) throws 
WebloggerException;
+    void removeAutoPings(Collection autopings) throws WebloggerException;
     
     
     /**
@@ -76,7 +76,7 @@ public interface AutoPingManager {
      *
      * @throws WebloggerException
      */
-    public void removeAllAutoPings() throws WebloggerException;
+    void removeAllAutoPings() throws WebloggerException;
     
     
     /**
@@ -86,7 +86,7 @@ public interface AutoPingManager {
      * @return the auto ping configuration with specified id or null if not 
found
      * @throws WebloggerException
      */
-    public AutoPing getAutoPing(String id) throws WebloggerException;
+    AutoPing getAutoPing(String id) throws WebloggerException;
     
     
     /**
@@ -95,7 +95,7 @@ public interface AutoPingManager {
      * @param website
      * @return a list of auto ping configurations for the given website as 
<code>AuAutoPingcode> objects.
      */
-    public List getAutoPingsByWebsite(Weblog website) throws 
WebloggerException;
+    List getAutoPingsByWebsite(Weblog website) throws WebloggerException;
     
     
     /**
@@ -104,7 +104,7 @@ public interface AutoPingManager {
      * @param pingTarget
      * @return a list of auto ping configurations for the given target as 
<code>AuAutoPingcode> objects.
      */
-    public List getAutoPingsByTarget(PingTarget pingTarget) throws 
WebloggerException;
+    List getAutoPingsByTarget(PingTarget pingTarget) throws WebloggerException;
     
     
     /**
@@ -113,7 +113,7 @@ public interface AutoPingManager {
      * @param changedWeblogEntry the entry that has been created or changed
      * @return a list of the ping configurations that should be applied due to 
this change
      */
-    public List getApplicableAutoPings(WeblogEntry changedWeblogEntry) throws 
WebloggerException;
+    List getApplicableAutoPings(WeblogEntry changedWeblogEntry) throws 
WebloggerException;
     
     
     /**
@@ -123,7 +123,7 @@ public interface AutoPingManager {
      *
      * @param changedWeblogEntry the entry that has been created or changed
      */
-    public void queueApplicableAutoPings(WeblogEntry changedWeblogEntry) 
throws WebloggerException;
+    void queueApplicableAutoPings(WeblogEntry changedWeblogEntry) throws 
WebloggerException;
     
     
     /**
@@ -134,7 +134,7 @@ public interface AutoPingManager {
      *         will be empty if there are no restrictions (meaning that the 
auto ping configuration applies to changes
      *         in any category of the website).
      */
-    public List getCategoryRestrictions(AutoPing autoPing) throws 
WebloggerException;
+    List getCategoryRestrictions(AutoPing autoPing) throws WebloggerException;
     
     
     /**
@@ -144,13 +144,13 @@ public interface AutoPingManager {
      * @param autoPing      auto ping configuration to change
      * @param newCategories a collection of <code>WeblogCategoryData</code> 
objects for the new category restrictions
      */
-    public void setCategoryRestrictions(AutoPing autoPing,
+    void setCategoryRestrictions(AutoPing autoPing,
             Collection newCategories);
     
     
     /**
      * Release all resources associated with Roller session.
      */
-    public void release();
+    void release();
     
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingTargetManager.java
 Mon Jul 22 01:43:18 2013
@@ -38,7 +38,7 @@ public interface PingTargetManager {
      * @param pingTarget ping target data object.
      * @throws WebloggerException
      */
-    public void savePingTarget(PingTarget pingTarget) throws 
WebloggerException;
+    void savePingTarget(PingTarget pingTarget) throws WebloggerException;
     
     
     /**
@@ -47,13 +47,13 @@ public interface PingTargetManager {
      * @param id id of the ping target to be removed
      * @throws WebloggerException
      */
-    public void removePingTarget(PingTarget pingTarget) throws 
WebloggerException;
+    void removePingTarget(PingTarget pingTarget) throws WebloggerException;
     
     
     /**
      * Remove all custom targets (regardless of website).
      */
-    public void removeAllCustomPingTargets() throws WebloggerException;
+    void removeAllCustomPingTargets() throws WebloggerException;
     
     
     /**
@@ -63,7 +63,7 @@ public interface PingTargetManager {
      * @return the ping target whose id is specified.
      * @throws WebloggerException
      */
-    public PingTarget getPingTarget(String id) throws WebloggerException;
+    PingTarget getPingTarget(String id) throws WebloggerException;
     
     
     /**
@@ -72,7 +72,7 @@ public interface PingTargetManager {
      * @return the list of common ping targets as a <code>List</code> of 
{@link PPingTarget objects
      * @throws WebloggerException
      */
-    public List getCommonPingTargets() throws WebloggerException;
+    List getCommonPingTargets() throws WebloggerException;
     
     
     /**
@@ -82,7 +82,7 @@ public interface PingTargetManager {
      * @return the list of custom ping targets for the given website as a 
<code>List</code> of {@link PiPingTarget         objects
      * @throws WebloggerException
      */
-    public List getCustomPingTargets(Weblog website) throws WebloggerException;
+    List getCustomPingTargets(Weblog website) throws WebloggerException;
     
     
     /**
@@ -95,7 +95,7 @@ public interface PingTargetManager {
      * @return true if the name is unique in the appropriate set (custom or 
common) ping targets.
      * @throws WebloggerException
      */
-    public boolean isNameUnique(PingTarget pingTarget) throws 
WebloggerException;
+    boolean isNameUnique(PingTarget pingTarget) throws WebloggerException;
     
     
     /**
@@ -106,7 +106,7 @@ public interface PingTargetManager {
      * @return true if the <code>pingUrl</code> property of the ping target is 
a well-formed url.
      * @throws WebloggerException
      */
-    public boolean isUrlWellFormed(PingTarget pingTarget) throws 
WebloggerException;
+    boolean isUrlWellFormed(PingTarget pingTarget) throws WebloggerException;
     
     
     /**
@@ -119,12 +119,12 @@ public interface PingTargetManager {
      *         ping target is a valid IP address or a hostname that can be 
resolved on the server.
      * @throws WebloggerException
      */
-    public boolean isHostnameKnown(PingTarget pingTarget) throws 
WebloggerException;
+    boolean isHostnameKnown(PingTarget pingTarget) throws WebloggerException;
     
     
     /**
      * Release all resources associated with Roller session.
      */
-    public void release();
+    void release();
     
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/RefererManager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/RefererManager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/RefererManager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/RefererManager.java
 Mon Jul 22 01:43:18 2013
@@ -31,41 +31,41 @@ public interface RefererManager {    
     /**
      * Store the referer.
      */
-    public void saveReferer(WeblogReferrer referer) throws WebloggerException; 
   
+    void saveReferer(WeblogReferrer referer) throws WebloggerException;
     
     /**
      * Remove a single referer.
      */
-    public void removeReferer(WeblogReferrer referer) throws 
WebloggerException;    
+    void removeReferer(WeblogReferrer referer) throws WebloggerException;
     
     /**
      * Clear referrer dayhits and remove referrers without excerpts.
      */
-    public void clearReferrers() throws WebloggerException;    
+    void clearReferrers() throws WebloggerException;
     
     /**
      * Clear referrer dayhits and remove referrers without excerpts.
      */
-    public void clearReferrers(Weblog website) throws WebloggerException;    
+    void clearReferrers(Weblog website) throws WebloggerException;
     
     /**
      * Retrieve referer by id.
      */
-    public WeblogReferrer getReferer(String id) throws WebloggerException;    
+    WeblogReferrer getReferer(String id) throws WebloggerException;
     
     /**
      * Get all referers for specified weblog.
      * @param weblog
      * @return List of type RefererData
      */
-    public List getReferers(Weblog weblog) throws WebloggerException;    
+    List getReferers(Weblog weblog) throws WebloggerException;
     
     /**
      * Get all referers for specified user that were made today.
      * @param userName Name of user.
      * @return List of type RefererData
      */
-    public List getTodaysReferers(Weblog website) throws WebloggerException;   
 
+    List getTodaysReferers(Weblog website) throws WebloggerException;
     
     /**
      * Get referers for a specified date.
@@ -74,7 +74,7 @@ public interface RefererManager {    
      * @return List of type RefererData.
      * @throws WebloggerException
      */
-    public List getReferersToDate(Weblog website, String date) 
+    List getReferersToDate(Weblog website, String date)
         throws WebloggerException;    
         
     /**
@@ -84,7 +84,7 @@ public interface RefererManager {    
      * @param len       Maximum number of results to return (for paging)
      * @return List of StatCount objects.
      */
-    public List getHotWeblogs(int sinceDays, int offset, int length) 
+    List getHotWeblogs(int sinceDays, int offset, int length)
         throws WebloggerException; 
 
     /**
@@ -93,32 +93,32 @@ public interface RefererManager {    
      * @return List of RefererData objects.
      * @throws WebloggerException
      */
-    public List getReferersToEntry(String entryid) throws WebloggerException;  
 
+    List getReferersToEntry(String entryid) throws WebloggerException;
     
     /** 
      * Get user's day hits 
      */
-    public int getDayHits(Weblog website) throws WebloggerException;    
+    int getDayHits(Weblog website) throws WebloggerException;
     
     /** 
      * Get user's all-time total hits 
      */
-    public int getTotalHits(Weblog website) throws WebloggerException;    
+    int getTotalHits(Weblog website) throws WebloggerException;
     
     /**
      * Apply ignoreWord/spam filters to all referers in system.
      */
-    public void applyRefererFilters() throws WebloggerException;    
+    void applyRefererFilters() throws WebloggerException;
     
     /**
      * Apply ignoreWord/spam filters to all referers in website.
      */
-    public void applyRefererFilters(Weblog website) throws WebloggerException; 
   
+    void applyRefererFilters(Weblog website) throws WebloggerException;
     
     /**
      * Process an incoming referer.
      */
-    public void processReferrer(
+    void processReferrer(
             String requestUrl,
             String referrerUrl,
             String weblogHandle,
@@ -128,6 +128,6 @@ public interface RefererManager {    
     /**
      * Release all resources held by manager.
      */
-    public void release();  
+    void release();
 }
 

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManager.java
 Mon Jul 22 01:43:18 2013
@@ -28,7 +28,7 @@ import org.apache.roller.weblogger.pojos
  */
 public interface ThreadManager {
     
-    public static final long MIN_RATE_INTERVAL_MINS = 1;
+    long MIN_RATE_INTERVAL_MINS = 1;
     
     
     /**
@@ -36,7 +36,7 @@ public interface ThreadManager {
      *
      * @throws InitializationException If there is a problem during 
initialization.
      */
-    public void initialize() throws InitializationException;
+    void initialize() throws InitializationException;
     
     
     /**
@@ -44,14 +44,14 @@ public interface ThreadManager {
      * @param runnable
      * @throws java.lang.InterruptedException
      */
-    public void executeInBackground(Runnable runnable)
+    void executeInBackground(Runnable runnable)
         throws InterruptedException;
     
     
     /**
      * Execute runnable in foreground (synchronously).
      */
-    public void executeInForeground(Runnable runnable)
+    void executeInForeground(Runnable runnable)
         throws InterruptedException;
     
     
@@ -62,7 +62,7 @@ public interface ThreadManager {
      * @return The TaskLock for the task, or null if not found.
      * @throws WebloggerException If there is an error looking up the TaskLock.
      */
-    public TaskLock getTaskLockByName(String name) throws WebloggerException;
+    TaskLock getTaskLockByName(String name) throws WebloggerException;
 
     
     /**
@@ -71,7 +71,7 @@ public interface ThreadManager {
      * @param tasklock The TaskLock to save.
      * @throws WebloggerException If there is an error saving the TaskLock.
      */
-    public void saveTaskLock(TaskLock tasklock) throws WebloggerException;
+    void saveTaskLock(TaskLock tasklock) throws WebloggerException;
 
 
     /**
@@ -80,7 +80,7 @@ public interface ThreadManager {
      * @param task The RollerTask to register the lease for.
      * @return boolean True if lease was registered, False otherwise.
      */
-    public boolean registerLease(RollerTask task);
+    boolean registerLease(RollerTask task);
     
     
     /**
@@ -89,18 +89,18 @@ public interface ThreadManager {
      * @param task The RollerTask to unregister the lease for.
      * @return boolean True if lease was unregistered (or was not leased), 
False otherwise.
      */
-    public boolean unregisterLease(RollerTask task);
+    boolean unregisterLease(RollerTask task);
     
     
     /**
      * Shutdown.
      */
-    public void shutdown();
+    void shutdown();
     
     
     /**
      * Release all resources associated with Roller session.
      */
-    public void release();
+    void release();
     
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManager.java
 Mon Jul 22 01:43:18 2013
@@ -30,27 +30,27 @@ import org.apache.roller.weblogger.pojos
 public interface IndexManager
 {
     /** Does index need to be rebuild */
-    public abstract boolean isInconsistentAtStartup();
+    boolean isInconsistentAtStartup();
     
     /** Remove user from index, returns immediately and operates in background 
*/
-    public void removeWebsiteIndex(Weblog website) throws WebloggerException;
+    void removeWebsiteIndex(Weblog website) throws WebloggerException;
     
     /** Remove entry from index, returns immediately and operates in 
background */
-    public void removeEntryIndexOperation(WeblogEntry entry) throws 
WebloggerException;
+    void removeEntryIndexOperation(WeblogEntry entry) throws 
WebloggerException;
     
     /** Add entry to index, returns immediately and operates in background */
-    public void addEntryIndexOperation(WeblogEntry entry) throws 
WebloggerException;
+    void addEntryIndexOperation(WeblogEntry entry) throws WebloggerException;
     
     /** R-index entry, returns immediately and operates in background */
-    public void addEntryReIndexOperation(WeblogEntry entry) throws 
WebloggerException;
+    void addEntryReIndexOperation(WeblogEntry entry) throws WebloggerException;
     
     /** Execute operation immediately */
-    public abstract void executeIndexOperationNow(final IndexOperation op);
+    void executeIndexOperationNow(final IndexOperation op);
 
     /**
      * Release all resources associated with Roller session.
      */
-    public abstract void release();
+    void release();
     
     
     /**
@@ -58,14 +58,14 @@ public interface IndexManager
      *
      * @throws InitializationException If there is a problem during 
initialization.
      */
-    public void initialize() throws InitializationException;
+    void initialize() throws InitializationException;
     
     
     /** Shutdown to be called on application shutdown */
-    public abstract void shutdown();
+    void shutdown();
 
-    public abstract void rebuildWebsiteIndex(Weblog website) throws 
WebloggerException;
+    void rebuildWebsiteIndex(Weblog website) throws WebloggerException;
 
-    public abstract void rebuildWebsiteIndex() throws WebloggerException;
+    void rebuildWebsiteIndex() throws WebloggerException;
 
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
 Mon Jul 22 01:43:18 2013
@@ -1203,7 +1203,7 @@ public class DatabaseInstaller {
         String[] types = {"TABLE"};
         ResultSet rs = con.getMetaData().getTables(null, null, "%", null);
         while (rs.next()) {
-            if 
(tableName.toLowerCase().equals(rs.getString("TABLE_NAME").toLowerCase())) {
+            if 
(tableName.equalsIgnoreCase(rs.getString("TABLE_NAME").toLowerCase())) {
                 return true;
             }
         }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java 
(original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java 
Mon Jul 22 01:43:18 2013
@@ -34,44 +34,44 @@ public interface Template {
     /**
      * The unique identifier for this Template.
      */
-    public String getId();
+    String getId();
     
     
     /**
      * A simple name for this Template.
      */
-    public String getName();
+    String getName();
     
     
     /**
      * A description of the contents of this Template.
      */
-    public String getDescription();
+    String getDescription();
     
     
     /**
      * The last time the template was modified.
      */
-    public Date getLastModified();
+    Date getLastModified();
     
     
     /**
      * The templating language used by this template.
      */
 
-    public String getTemplateLanguage();
+    String getTemplateLanguage();
 
     /**
      * Set the template language.This is used by template code object to assign
      * correct template language for different template content types
      */
-    public  void setTemplateLanguage(String templateLanguage);
+    void setTemplateLanguage(String templateLanguage);
     
     
     /**
      * Content-type of output or null if none defined.
      */
-    public String getOutputContentType();
+    String getOutputContentType();
 
     /**
      *
@@ -81,12 +81,12 @@ public interface Template {
 
     @Deprecated
     //Moved to templateCode
-    public String getType();
+    String getType();
 
     /**
      *
      * get the Template code object for the given type.
      */
-    public TemplateCode getTemplateCode(String type) throws WebloggerException;
+    TemplateCode getTemplateCode(String type) throws WebloggerException;
     
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java 
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java 
Mon Jul 22 01:43:18 2013
@@ -33,75 +33,75 @@ public interface Theme {
     /**
      * A unique identifier for this Theme.
      */
-    public String getId();
+    String getId();
     
     
     /**
      * A common or display name for this Theme.
      */
-    public String getName();
+    String getName();
 
     /**
      * A description of the Theme.
      */
-    public String getDescription();
+    String getDescription();
     
     
     /**
      * The last modification date of the Theme.
      */
-    public Date getLastModified();
+    Date getLastModified();
     
     
     /**
      * Is the Theme enable for use?
      */
-    public boolean isEnabled();
+    boolean isEnabled();
     
     
     /**
      * Get the list of all templates associated with this Theme.
      */
-    public List getTemplates() throws WebloggerException;
+    List getTemplates() throws WebloggerException;
     
     
     /**
      * Lookup the stylesheet template for the Theme.
      */
-    public ThemeTemplate getStylesheet() throws WebloggerException;
+    ThemeTemplate getStylesheet() throws WebloggerException;
     
     
     /**
      * Lookup the default template for the Theme.
      */
-    public ThemeTemplate getDefaultTemplate() throws WebloggerException;
+    ThemeTemplate getDefaultTemplate() throws WebloggerException;
     
     
     /**
      * Lookup a template by action.
      * Returns null if the template cannot be found.
      */
-    public ThemeTemplate getTemplateByAction(String action) throws 
WebloggerException;
+    ThemeTemplate getTemplateByAction(String action) throws WebloggerException;
     
     
     /**
      * Lookup a template by name.
      * Returns null if the template cannot be found.
      */
-    public ThemeTemplate getTemplateByName(String name) throws 
WebloggerException;
+    ThemeTemplate getTemplateByName(String name) throws WebloggerException;
     
     
     /**
      * Lookup a template by link.
      * Returns null if the template cannot be found.
      */
-    public ThemeTemplate getTemplateByLink(String link) throws 
WebloggerException;
+    ThemeTemplate getTemplateByLink(String link) throws WebloggerException;
     
     
     /**
      * Lookup a resource by path.
      * Returns null if the resource cannot be found.
      */
-    public ThemeResource getResource(String path);
+    ThemeResource getResource(String path);
     
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
 Mon Jul 22 01:43:18 2013
@@ -26,15 +26,15 @@ package org.apache.roller.weblogger.pojo
  */
 public interface ThemeTemplate extends Template {
     
-    public static final String ACTION_WEBLOG = "weblog";
-    public static final String ACTION_PERMALINK = "permalink";
-    public static final String ACTION_SEARCH = "search";
-    public static final String ACTION_TAGSINDEX = "tagsIndex";
-    public static final String ACTION_CUSTOM = "custom";
+    String ACTION_WEBLOG = "weblog";
+    String ACTION_PERMALINK = "permalink";
+    String ACTION_SEARCH = "search";
+    String ACTION_TAGSINDEX = "tagsIndex";
+    String ACTION_CUSTOM = "custom";
     
     // the full list of supported special actions, which purposely does not
     // contain an entry for the 'custom' action
-    public static final String[] ACTIONS = {
+    String[] ACTIONS = {
         ACTION_WEBLOG, 
         ACTION_PERMALINK, 
         ACTION_SEARCH, 
@@ -45,48 +45,49 @@ public interface ThemeTemplate extends T
     /**
      * The action this template is defined for.
      */
-    public String getAction();
+    String getAction();
     
     
     /**
      * The contents or body of the Template.
      */
-    public String getContents();
+    String getContents();
 
     /**
      * set content. This will be used by template code objects to store 
different
      * types of template contents
      */
-     public void setContents(String contents);
+    void setContents(String contents);
+
     /**
      * The url link value for this Template.  If this template is not
      * private this is the url that it can be accessed at.
      */
-    public String getLink();
+    String getLink();
     
     
     /**
      * Is the Template hidden?  A hidden template cannot be accessed directly.
      */
-    public boolean isHidden();
+    boolean isHidden();
     
     
     /**
      * Is the Template to be included in the navbar?
      */
-    public boolean isNavbar();
+    boolean isNavbar();
     
     
     /**
      * The name of the decorator template to apply.
      */
-    public String getDecoratorName();
+    String getDecoratorName();
     
     
     /**
      * The decorator Template to apply.  This returns null if no decorator
      * should be applied.
      */
-    public ThemeTemplate getDecorator();
+    ThemeTemplate getDecorator();
 
 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarModel.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarModel.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarModel.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarModel.java
 Mon Jul 22 01:43:18 2013
@@ -25,21 +25,21 @@ import java.util.Date;
  * then use the computeUrl method to get the URLs it needs.
  */
 public interface CalendarModel {
-    public Calendar getCalendar();
+    Calendar getCalendar();
     
-    public void setDay( String month ) throws Exception;
+    void setDay( String month ) throws Exception;
     
-    public Date getDay();
+    Date getDay();
     
-    public Date getNextMonth();
+    Date getNextMonth();
 
-    public Date getPrevMonth();
+    Date getPrevMonth();
     
-    public String computePrevMonthUrl();
+    String computePrevMonthUrl();
     
-    public String computeTodayMonthUrl();
+    String computeTodayMonthUrl();
     
-    public String computeNextMonthUrl();
+    String computeNextMonthUrl();
 
     /**
      * Get the earliest month in which there could possibly be data.  For a 
weblog this
@@ -56,7 +56,7 @@ public interface CalendarModel {
      * @param valid    Always return a URL, never return null
      * @return         URL for day, or null if no weblog entry on that day
      */
-    public String computeUrl( java.util.Date day, boolean monthURL, boolean 
valid );
+    String computeUrl( java.util.Date day, boolean monthURL, boolean valid );
     
     /**
      * Get calendar cell content or null if none.
@@ -65,6 +65,6 @@ public interface CalendarModel {
      * @param valid Always return a URL, never return null
      * @return Calendar cell content or null if none.
      */
-    public String getContent( java.util.Date day );
+    String getContent( java.util.Date day );
 }
 

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPager.java
 Mon Jul 22 01:43:18 2013
@@ -33,57 +33,57 @@ public interface WeblogEntriesPager {  
      * The collection is grouped by days of entries.  Each value is a list of
      * entry objects keyed by the date they were published.
      */
-    public Map getEntries();
+    Map getEntries();
         
     /**
      * Link value for returning to pager home
      */
-    public String getHomeLink();
+    String getHomeLink();
 
     /**
      * Name of pager home.
      */
-    public String getHomeName();
+    String getHomeName();
 
     /**
      * Link value for next page in current collection view
      */
-    public String getNextLink();
+    String getNextLink();
 
     /**
      * Name for next page in current collection view
      */
-    public String getNextName();
+    String getNextName();
 
     /**
      * Link value for prev page in current collection view
      */
-    public String getPrevLink();
+    String getPrevLink();
 
     /**
      * Link value for prev page in current collection view
      */
-    public String getPrevName();
+    String getPrevName();
     
         /**
      * Link value for next collection view
      */
-    public String getNextCollectionLink();
+    String getNextCollectionLink();
     
     /**
      * Name for next collection view
      */
-    public String getNextCollectionName();  
+    String getNextCollectionName();
     
     /**
      * Link value for prev collection view
      */
-    public String getPrevCollectionLink(); 
+    String getPrevCollectionLink();
     
     /**
      * Name for prev collection view
      */
-    public String getPrevCollectionName(); 
+    String getPrevCollectionName();
     
 }
 

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
 Mon Jul 22 01:43:18 2013
@@ -47,7 +47,7 @@ import org.apache.roller.weblogger.pojos
  */
 public class UserDataServlet extends HttpServlet {
     
-    private final int MAX_LENGTH = 50;
+    private static final int MAX_LENGTH = 50;
     
     public void doGet(HttpServletRequest request, 
                       HttpServletResponse response)

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java
 Mon Jul 22 01:43:18 2013
@@ -34,33 +34,33 @@ public abstract class Entry {
     protected static final Namespace NAMESPACE = 
Namespace.getNamespace("http://purl.org/apache/roller/rap#";);
     
     /** Entry types. */
-    public static interface Types {
+    public interface Types {
         /** 
          * User entry.
          * A user entry is contained within a user entry set.
          */
-        public static final String USER = "user";
+        String USER = "user";
         /**
          * Weblog entry.
          * A weblog entry is contained within a weblog entry set.
          */
-        public static final String WEBLOG = "weblog";
+        String WEBLOG = "weblog";
         /**
          * Member entry.
          * A member entry is contained within a member entry set.
          */
-        public static final String MEMBER = "member";
+        String MEMBER = "member";
         /**
          * Collection entry.
          * A collection entry is contained within a workspace, which is
          * contained within a service.
          */
-        public static final String COLLECTION = "collection";
+        String COLLECTION = "collection";
     }
     
     /** XML attributes common to all entry types. */
-    protected static interface Attributes {
-        public static final String HREF = "href";
+    protected interface Attributes {
+        String HREF = "href";
     }
     
     private String href = null;

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java
 Mon Jul 22 01:43:18 2013
@@ -36,16 +36,16 @@ import org.apache.roller.weblogger.webse
 public class MemberEntry extends Entry {
     /** Member permissions */
     public interface Permissions {
-        public static final String ADMIN = "ADMIN";
-        public static final String AUTHOR = "AUTHOR";
-        public static final String LIMITED = "LIMITED";
+        String ADMIN = "ADMIN";
+        String AUTHOR = "AUTHOR";
+        String LIMITED = "LIMITED";
     }
     
-    static interface Tags {
-        public static final String MEMBER = "member";
-        public static final String NAME = "name";
-        public static final String HANDLE = "handle";
-        public static final String PERMISSION = "permission";
+    interface Tags {
+        String MEMBER = "member";
+        String NAME = "name";
+        String HANDLE = "handle";
+        String PERMISSION = "permission";
     }
     
     private String name;

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java?rev=1505582&r1=1505581&r2=1505582&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
 Mon Jul 22 01:43:18 2013
@@ -39,19 +39,19 @@ import org.apache.roller.weblogger.webse
  * This class describes a weblog entry.
  */
 public class WeblogEntry extends Entry {
-    static interface Tags {
-        public static final String WEBLOG = "weblog";
-        public static final String HANDLE = "handle";
-        public static final String NAME = "name";
-        public static final String DESCRIPTION = "description";
-        public static final String LOCALE = "locale";
-        public static final String TIMEZONE = "timezone";
-        public static final String DATE_CREATED = "date-created";
-        public static final String CREATING_USER = "creating-user";
-        public static final String EMAIL_ADDRESS = "email-address";
-        public static final String APP_ENTRIES_URL = "app-entries-url";
-        public static final String APP_RESOURCES_URL = "app-resources-url";
-        public static final String ENABLED = "enabled";
+    interface Tags {
+        String WEBLOG = "weblog";
+        String HANDLE = "handle";
+        String NAME = "name";
+        String DESCRIPTION = "description";
+        String LOCALE = "locale";
+        String TIMEZONE = "timezone";
+        String DATE_CREATED = "date-created";
+        String CREATING_USER = "creating-user";
+        String EMAIL_ADDRESS = "email-address";
+        String APP_ENTRIES_URL = "app-entries-url";
+        String APP_RESOURCES_URL = "app-resources-url";
+        String ENABLED = "enabled";
     }
     
     private String handle;


Reply via email to