You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/07/19 13:01:24 UTC

svn commit: r1504827 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger: business/ pojos/ ui/core/filters/ ui/core/security/ ui/rendering/ util/ util/cache/ webservices/adminprotocol/sdk/

Author: gmazza
Date: Fri Jul 19 11:01:23 2013
New Revision: 1504827

URL: http://svn.apache.org/r1504827
Log:
Fixed some Sonar complaints over redundant modifiers.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AutoProvision.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererFactory.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/UserManager.java Fri Jul 19 11:01:23 2013
@@ -46,7 +46,7 @@ public interface UserManager {
      * @param newUser User object to be added.
      * @throws WebloggerException If there is a problem.
      */
-    public void addUser(User newUser) throws WebloggerException;
+    void addUser(User newUser) throws WebloggerException;
     
     
     /**
@@ -55,7 +55,7 @@ public interface UserManager {
      * @param user User to be saved.
      * @throws WebloggerException If there is a problem.
      */
-    public void saveUser(User user) throws WebloggerException;
+    void saveUser(User user) throws WebloggerException;
     
     
     /**
@@ -64,13 +64,13 @@ public interface UserManager {
      * @param user User to be removed.
      * @throws WebloggerException If there is a problem.
      */
-    public void removeUser(User user) throws WebloggerException;
+    void removeUser(User user) throws WebloggerException;
     
     
     /**
      * Get count of enabled users
      */    
-    public long getUserCount() throws WebloggerException; 
+    long getUserCount() throws WebloggerException;
     
     
     /**
@@ -79,7 +79,7 @@ public interface UserManager {
      * @return
      * @throws WebloggerException
      */
-    public User getUserByActivationCode(String activationCode) 
+    User getUserByActivationCode(String activationCode)
             throws WebloggerException;
     
           
@@ -96,7 +96,7 @@ public interface UserManager {
      * @return UsUserhe user, or null if not found or is disabled.
      * @throws WebloggerException If there is a problem.
      */
-    public User getUserByUserName(String userName) throws WebloggerException;
+    User getUserByUserName(String userName) throws WebloggerException;
     
     /**
      * Lookup a user by UserName with the given enabled status.
@@ -105,7 +105,7 @@ public interface UserManager {
      * @return The user, or null if not found or doesn't match the proper enabled status.
      * @throws WebloggerException If there is a problem.
      */
-    public User getUserByUserName(String userName, Boolean enabled)
+    User getUserByUserName(String userName, Boolean enabled)
         throws WebloggerException;
     
 
@@ -125,7 +125,7 @@ public interface UserManager {
      * @return List A list of UserDatUsers which match the criteria.
      * @throws WebloggerException If there is a problem.
      */
-    public List getUsers(
+    List getUsers(
             Boolean enabled,
             Date    startDate,
             Date    endDate,
@@ -142,7 +142,7 @@ public interface UserManager {
      * @param enabled    True for only enalbed, false for disabled, null for all
      * @return List of (up to length) users that match startsWith string
      */
-    public List getUsersStartingWith(String startsWith,
+    List getUsersStartingWith(String startsWith,
             Boolean enabled, int offset, int length) throws WebloggerException;
     
     
@@ -151,13 +151,13 @@ public interface UserManager {
      * containing integers reflecting the number of users whose
      * names start with each letter.
      */
-    public Map getUserNameLetterMap() throws WebloggerException;
+    Map getUserNameLetterMap() throws WebloggerException;
     
     
     /** 
      * Get collection of users whose names begin with specified letter 
      */
-    public List getUsersByLetter(char letter, int offset, int length) 
+    List getUsersByLetter(char letter, int offset, int length)
         throws WebloggerException;
     
         
@@ -172,7 +172,7 @@ public interface UserManager {
      * @return UsUserhe user, or null if not found or is disabled.
      * @throws WebloggerException If there is a problem
      */
-    public User getUserByAttribute(String name, String value) throws WebloggerException;
+    User getUserByAttribute(String name, String value) throws WebloggerException;
     
     /**
      * Lookup a user by User attribute
@@ -183,7 +183,7 @@ public interface UserManager {
      * @return The user, or null if not found or is disabled.
      * @throws WebloggerException If there is a problem
      */
-    public User getUserByAttribute(String name, String value, Boolean enabled) throws WebloggerException;
+    User getUserByAttribute(String name, String value, Boolean enabled) throws WebloggerException;
     
     
     /**
@@ -192,7 +192,7 @@ public interface UserManager {
      * @param attribute Atribute name
      * @return List of user attributes
      */
-    public UserAttribute getUserAttribute(String userName, String attribute) throws WebloggerException;
+    UserAttribute getUserAttribute(String userName, String attribute) throws WebloggerException;
     
     
     /**
@@ -202,7 +202,7 @@ public interface UserManager {
      * @param value Atribute value
      * @throws org.apache.roller.weblogger.WebloggerException
      */
-    public void setUserAttribute(String userName, String attribute, String value) throws WebloggerException;
+    void setUserAttribute(String userName, String attribute, String value) throws WebloggerException;
     
     
     /**
@@ -211,7 +211,7 @@ public interface UserManager {
      * @return List of attributes.
      * @throws org.apache.roller.weblogger.WebloggerException
      */
-    public List<UserAttribute> getUserAttributes(String userName) throws WebloggerException;
+    List<UserAttribute> getUserAttributes(String userName) throws WebloggerException;
     
     
     //-------------------------------------------------------- permissions CRUD
@@ -220,7 +220,7 @@ public interface UserManager {
     /**
      * Return true if user has permission specified.
      */
-    public boolean checkPermission(RollerPermission perm, User user) 
+    boolean checkPermission(RollerPermission perm, User user)
             throws WebloggerException;
     
     
@@ -231,7 +231,7 @@ public interface UserManager {
      * @param user    User to grant permissions to
      * @param actions Actions to be granted
      */
-    public void grantWeblogPermission(Weblog weblog, User user, List<String> actions)
+    void grantWeblogPermission(Weblog weblog, User user, List<String> actions)
             throws WebloggerException;
 
     
@@ -242,7 +242,7 @@ public interface UserManager {
      * @param user    User to grant permissions to
      * @param actions Actions to be granted
      */
-    public void grantWeblogPermissionPending(Weblog weblog, User user, List<String> actions)
+    void grantWeblogPermissionPending(Weblog weblog, User user, List<String> actions)
             throws WebloggerException;
 
     
@@ -253,7 +253,7 @@ public interface UserManager {
      * @param user    User to grant permissions to
      * @param actions Actions to be granted
      */
-    public void confirmWeblogPermission(Weblog weblog, User user)
+    void confirmWeblogPermission(Weblog weblog, User user)
             throws WebloggerException;
 
     
@@ -264,7 +264,7 @@ public interface UserManager {
      * @param user    User to grant permissions to
      * @param actions Actions to be granted
      */
-    public void declineWeblogPermission(Weblog weblog, User user)
+    void declineWeblogPermission(Weblog weblog, User user)
             throws WebloggerException;
 
     
@@ -275,42 +275,42 @@ public interface UserManager {
      * @param user    User to grant permissions to
      * @param actions Actions to be granted
      */
-    public void revokeWeblogPermission(Weblog weblog, User user, List<String> actions)
+    void revokeWeblogPermission(Weblog weblog, User user, List<String> actions)
             throws WebloggerException;
 
     
     /**
      * Get all of user's weblog permissions.
      */
-    public List<WeblogPermission> getWeblogPermissions(User user) 
+    List<WeblogPermission> getWeblogPermissions(User user)
             throws WebloggerException;
     
     
     /**
      * Get all of user's pending weblog permissions.
      */
-    public List<WeblogPermission> getWeblogPermissionsPending(User user) 
+    List<WeblogPermission> getWeblogPermissionsPending(User user)
             throws WebloggerException;
     
     
     /**
      * Get all permissions associated with a weblog.
      */
-    public List<WeblogPermission> getWeblogPermissions(Weblog weblog) 
+    List<WeblogPermission> getWeblogPermissions(Weblog weblog)
             throws WebloggerException;
     
     
     /**
      * Get all pending permissions associated with a weblog.
      */
-    public List<WeblogPermission> getWeblogPermissionsPending(Weblog weblog) 
+    List<WeblogPermission> getWeblogPermissionsPending(Weblog weblog)
             throws WebloggerException;
     
     
     /**
      * Get user's permission within a weblog or null if none.
      */
-    public WeblogPermission getWeblogPermission(Weblog weblog, User user) 
+    WeblogPermission getWeblogPermission(Weblog weblog, User user)
             throws WebloggerException;        
     
     
@@ -320,20 +320,20 @@ public interface UserManager {
     /**
      * Grant role to user.
      */
-    public void grantRole(String roleName, User user) throws WebloggerException;
+    void grantRole(String roleName, User user) throws WebloggerException;
     
     
     /**
      * Revoke role from user.
      */
-    public void revokeRole(String roleName, User user) throws WebloggerException;
+    void revokeRole(String roleName, User user) throws WebloggerException;
 
         
     /**
      * Returns true if user has role specified, should be used only for testing.
      * @deprecated User checkPermission() instead.
      */
-    public boolean hasRole(String roleName, User user) throws WebloggerException;
+    boolean hasRole(String roleName, User user) throws WebloggerException;
     
     
     /**
@@ -341,13 +341,13 @@ public interface UserManager {
      * Get all roles associated with user.
      * @deprecated User checkPermission() instead.
      */
-    public List<String> getRoles(User user) throws WebloggerException;
+    List<String> getRoles(User user) throws WebloggerException;
 
     
     /**
      * Release any resources held by manager.
      */
-    public void release();   
+    void release();
 }
 
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java Fri Jul 19 11:01:23 2013
@@ -35,28 +35,28 @@ import org.apache.roller.weblogger.pojos
  */
 public interface WeblogEntryManager {
 
-    public static final String DESCENDING = "DESCENDING";
-    public static final String ASCENDING = "ASCENDING";
+    String DESCENDING = "DESCENDING";
+    String ASCENDING = "ASCENDING";
        
     /**
      * Save weblog entry.
      */
-    public void saveWeblogEntry(WeblogEntry entry) throws WebloggerException;
+    void saveWeblogEntry(WeblogEntry entry) throws WebloggerException;
        
     /**
      * Remove weblog entry.
      */
-    public void removeWeblogEntry(WeblogEntry entry) throws WebloggerException;    
+    void removeWeblogEntry(WeblogEntry entry) throws WebloggerException;
     
     /**
      * Get weblog entry by id.
      */
-    public WeblogEntry getWeblogEntry(String id) throws WebloggerException;
+    WeblogEntry getWeblogEntry(String id) throws WebloggerException;
     
     /** 
      * Get weblog entry by anchor. 
      */
-    public WeblogEntry getWeblogEntryByAnchor(Weblog website, String anchor) 
+    WeblogEntry getWeblogEntryByAnchor(Weblog website, String anchor)
             throws WebloggerException;
         
     /**
@@ -76,7 +76,7 @@ public interface WeblogEntryManager {
      * @return List of WeblogEntryData objects in reverse chrono order.
      * @throws WebloggerException
      */
-    public List getWeblogEntries(
+    List getWeblogEntries(
             Weblog website,
             User    user,
             Date        startDate,
@@ -106,7 +106,7 @@ public interface WeblogEntryManager {
      * @return Map of Lists, keyed by Date, and containing WeblogEntryData.
      * @throws WebloggerException
      */
-    public Map getWeblogEntryObjectMap(
+    Map getWeblogEntryObjectMap(
             Weblog website,
             Date        startDate,
             Date        endDate,
@@ -132,7 +132,7 @@ public interface WeblogEntryManager {
      * @return Map of Lists, keyed by Date, and containing date strings.
      * @throws WebloggerException
      */
-    public Map getWeblogEntryStringMap(
+    Map getWeblogEntryStringMap(
             Weblog website,
             Date        startDate,
             Date        endDate,
@@ -151,7 +151,7 @@ public interface WeblogEntryManager {
      * @param subcats True if sub-categories are to be fetched
      * @return        List of weblog entries in category
      */
-    public List getWeblogEntries(WeblogCategory cat, boolean subcats) 
+    List getWeblogEntries(WeblogCategory cat, boolean subcats)
             throws WebloggerException; 
     
     /** 
@@ -163,7 +163,7 @@ public interface WeblogEntryManager {
      * @param length     Max comments to return (or -1 for no limit)
      * @return List of WeblogEntryData objects.
      */
-    public List getMostCommentedWeblogEntries(
+    List getMostCommentedWeblogEntries(
             Weblog website,             
             Date        startDate,
             Date        endDate,
@@ -177,7 +177,7 @@ public interface WeblogEntryManager {
      * @param current The "current" WeblogEntryData
      * @param catName The value of the requested Category Name
      */
-    public WeblogEntry getNextEntry(WeblogEntry current, 
+    WeblogEntry getNextEntry(WeblogEntry current,
             String catName, String locale) throws WebloggerException;    
     
     /**
@@ -186,7 +186,7 @@ public interface WeblogEntryManager {
      * @param current The "current" WeblogEntryData.
      * @param catName The value of the requested Category Name.
      */
-    public WeblogEntry getPreviousEntry(WeblogEntry current, 
+    WeblogEntry getPreviousEntry(WeblogEntry current,
             String catName, String locale) throws WebloggerException;
       
     
@@ -195,36 +195,36 @@ public interface WeblogEntryManager {
      * @param max Maximum number to return.
      * @return Collection of WeblogEntryData objects.
      */
-    public List getWeblogEntriesPinnedToMain(Integer max) throws WebloggerException;
+    List getWeblogEntriesPinnedToMain(Integer max) throws WebloggerException;
 
     /**
      * Remove attribute with given name from given WeblogEntryData
      * @param name Name of attribute to be removed
      */
-    public void removeWeblogEntryAttribute(String name,WeblogEntry entry)
+    void removeWeblogEntryAttribute(String name,WeblogEntry entry)
             throws WebloggerException;
 
     /**
      * Remove tag with given name from given WeblogEntryData
      * @param name Name of tag to be removed
      */
-    public void removeWeblogEntryTag(String name,WeblogEntry entry)
+    void removeWeblogEntryTag(String name,WeblogEntry entry)
             throws WebloggerException;
 
     /**
      * Save weblog category.
      */
-    public void saveWeblogCategory(WeblogCategory cat) throws WebloggerException;
+    void saveWeblogCategory(WeblogCategory cat) throws WebloggerException;
     
     /**
      * Remove weblog category.
      */
-    public void removeWeblogCategory(WeblogCategory cat) throws WebloggerException;
+    void removeWeblogCategory(WeblogCategory cat) throws WebloggerException;
         
     /**
      * Get category by id.
      */
-    public WeblogCategory getWeblogCategory(String id) throws WebloggerException;
+    WeblogCategory getWeblogCategory(String id) throws WebloggerException;
     
     
     /**
@@ -232,21 +232,21 @@ public interface WeblogEntryManager {
      *
      * This moves the src category itself and all children and associated entries.
      */
-    public void moveWeblogCategory(WeblogCategory src, WeblogCategory dest)
+    void moveWeblogCategory(WeblogCategory src, WeblogCategory dest)
             throws WebloggerException;
     
     
     /**
      * Recategorize all entries with one category to another.
      */
-    public void moveWeblogCategoryContents(WeblogCategory srcCat, WeblogCategory destCat) 
+    void moveWeblogCategoryContents(WeblogCategory srcCat, WeblogCategory destCat)
             throws WebloggerException;
     
     /**
      * Get top level categories for a website.
      * @param website Website.
      */
-    public WeblogCategory getRootWeblogCategory(Weblog website) throws WebloggerException;
+    WeblogCategory getRootWeblogCategory(Weblog website) throws WebloggerException;
     
     
     /**
@@ -254,31 +254,31 @@ public interface WeblogEntryManager {
      * @param website      Website of WeblogCategory.
      * @param categoryPath Path of WeblogCategory, relative to category root.
      */
-    public WeblogCategory getWeblogCategoryByPath(Weblog website, 
+    WeblogCategory getWeblogCategoryByPath(Weblog website,
             String categoryPath) throws WebloggerException;
     
     
     /** 
      * Get WebLogCategory objects for a website. 
      */
-    public List getWeblogCategories(Weblog website, boolean includeRoot)
+    List getWeblogCategories(Weblog website, boolean includeRoot)
             throws WebloggerException;
     
                
     /**
      * Save comment.
      */
-    public void saveComment(WeblogEntryComment comment) throws WebloggerException;
+    void saveComment(WeblogEntryComment comment) throws WebloggerException;
     
     /**
      * Remove comment.
      */
-    public void removeComment(WeblogEntryComment comment) throws WebloggerException;
+    void removeComment(WeblogEntryComment comment) throws WebloggerException;
    
     /**
      * Get comment by id.
      */
-    public WeblogEntryComment getComment(String id) throws WebloggerException;
+    WeblogEntryComment getComment(String id) throws WebloggerException;
        
     /**
      * Generic comments query method.
@@ -291,7 +291,7 @@ public interface WeblogEntryManager {
      * @param offset     Offset into results for paging
      * @param length     Max comments to return (or -1 for no limit)
      */
-    public List getComments(
+    List getComments(
             
             Weblog          website,
             WeblogEntry     entry,
@@ -314,7 +314,7 @@ public interface WeblogEntryManager {
      * @param status     Status of comment
      * @return Number of comments deleted
      */
-    public int removeMatchingComments(
+    int removeMatchingComments(
             
             Weblog          website,
             WeblogEntry     entry,
@@ -328,31 +328,31 @@ public interface WeblogEntryManager {
     /**
      * Create unique anchor for weblog entry.
      */
-    public String createAnchor(WeblogEntry data) throws WebloggerException;    
+    String createAnchor(WeblogEntry data) throws WebloggerException;
     
     /**
      * Check for duplicate category name.
      */
-    public boolean isDuplicateWeblogCategoryName(WeblogCategory data)
+    boolean isDuplicateWeblogCategoryName(WeblogCategory data)
             throws WebloggerException;  
     
     /**
      * Check if weblog category is in use.
      */
-    public boolean isWeblogCategoryInUse(WeblogCategory data)
+    boolean isWeblogCategoryInUse(WeblogCategory data)
             throws WebloggerException;    
     
     
     /**
      * Apply comment default settings from website to all of website's entries.
      */
-    public void applyCommentDefaultsToEntries(Weblog website) 
+    void applyCommentDefaultsToEntries(Weblog website)
         throws WebloggerException;
     
     /**
      * Release all resources held by manager.
      */
-    public void release();    
+    void release();
     
     /**
      * Get list of TagStat. There's no offset/length params just a limit.
@@ -362,7 +362,7 @@ public interface WeblogEntryManager {
      * @return
      * @throws WebloggerException
      */
-    public List getPopularTags(Weblog website, Date startDate, int offset, int limit)
+    List getPopularTags(Weblog website, Date startDate, int offset, int limit)
             throws WebloggerException;
     
     /**
@@ -374,7 +374,7 @@ public interface WeblogEntryManager {
      * @return
      * @throws WebloggerException
      */
-    public List getTags(Weblog website, String sortBy, String startsWith, int offset, int limit)
+    List getTags(Weblog website, String sortBy, String startsWith, int offset, int limit)
             throws WebloggerException;    
     
     /**
@@ -390,7 +390,7 @@ public interface WeblogEntryManager {
      * @return True if tags exist, false otherwise.
      * @throws WebloggerException If there is any problem doing the operation.
      */
-    public boolean getTagComboExists(List tags, Weblog weblog) 
+    boolean getTagComboExists(List tags, Weblog weblog)
         throws WebloggerException;
     
     /**
@@ -404,7 +404,7 @@ public interface WeblogEntryManager {
      * @param amount    The amount to increment the tag count (it can be positive or negative).
      * @throws WebloggerException
      */
-    public void updateTagCount(String name, Weblog website, int amount)
+    void updateTagCount(String name, Weblog website, int amount)
         throws WebloggerException;
     
     
@@ -415,7 +415,7 @@ public interface WeblogEntryManager {
      * @return The HitCountData object, or null if it wasn't found.
      * @throws WebloggerException If there was a problem with the backend.
      */
-    public WeblogHitCount getHitCount(String id) throws WebloggerException;
+    WeblogHitCount getHitCount(String id) throws WebloggerException;
     
     
     /**
@@ -425,7 +425,7 @@ public interface WeblogEntryManager {
      * @return The HitCountData object, or null if it wasn't found.
      * @throws WebloggerException If there was a problem with the backend.
      */
-    public WeblogHitCount getHitCountByWeblog(Weblog weblog)
+    WeblogHitCount getHitCountByWeblog(Weblog weblog)
         throws WebloggerException;
     
     
@@ -444,7 +444,7 @@ public interface WeblogEntryManager {
      * @return The list of HitCountData objects ranked by hit count, descending.
      * @throws WebloggerException If there was a problem with the backend.
      */
-    public List getHotWeblogs(int sinceDays, int offset, int length)
+    List getHotWeblogs(int sinceDays, int offset, int length)
         throws WebloggerException;
     
     
@@ -454,7 +454,7 @@ public interface WeblogEntryManager {
      * @param hitCount The HitCountData object to save.
      * @throws WebloggerException If there was a problem with the backend.
      */
-    public void saveHitCount(WeblogHitCount hitCount) throws WebloggerException;
+    void saveHitCount(WeblogHitCount hitCount) throws WebloggerException;
     
     
     /**
@@ -463,7 +463,7 @@ public interface WeblogEntryManager {
      * @param hitCount The HitCountData object to remove.
      * @throws WebloggerException If there was a problem with the backend.
      */
-    public void removeHitCount(WeblogHitCount hitCount) throws WebloggerException;
+    void removeHitCount(WeblogHitCount hitCount) throws WebloggerException;
     
     
     /**
@@ -476,7 +476,7 @@ public interface WeblogEntryManager {
      * @param amount How much to increment by.
      * @throws WebloggerException If there was a problem with the backend.
      */
-    public void incrementHitCount(Weblog weblog, int amount)
+    void incrementHitCount(Weblog weblog, int amount)
         throws WebloggerException;
     
     
@@ -485,7 +485,7 @@ public interface WeblogEntryManager {
      *
      * @throws WebloggerException If there was a problem with the backend.
      */
-    public void resetAllHitCounts() throws WebloggerException;
+    void resetAllHitCounts() throws WebloggerException;
     
     
     /**
@@ -494,31 +494,31 @@ public interface WeblogEntryManager {
      * @param weblog The WebsiteData object to reset the count for.
      * @throws WebloggerException If there was a problem with the backend.
      */
-    public void resetHitCount(Weblog weblog) throws WebloggerException;
+    void resetHitCount(Weblog weblog) throws WebloggerException;
 
     
     /**
      * Get site-wide comment count 
      */
-    public long getCommentCount() throws WebloggerException;
+    long getCommentCount() throws WebloggerException;
 
     
     /**
      * Get weblog comment count 
      */    
-    public long getCommentCount(Weblog websiteData) throws WebloggerException;
+    long getCommentCount(Weblog websiteData) throws WebloggerException;
 
     
     /**
      * Get site-wide entry count 
      */    
-    public long getEntryCount() throws WebloggerException;
+    long getEntryCount() throws WebloggerException;
 
     
     /**
      * Get weblog entry count 
      */    
-    public long getEntryCount(Weblog websiteData) throws WebloggerException;
+    long getEntryCount(Weblog websiteData) throws WebloggerException;
     
 }
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java Fri Jul 19 11:01:23 2013
@@ -29,5 +29,5 @@ public interface ThemeResource extends R
      *
      * @return True if the resource is a directory, False otherwise.
      */
-    public boolean isDirectory();
+    boolean isDirectory();
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java Fri Jul 19 11:01:23 2013
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletRes
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.config.WebloggerConfig;
 
 
 /**

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AutoProvision.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AutoProvision.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AutoProvision.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AutoProvision.java Fri Jul 19 11:01:23 2013
@@ -21,6 +21,6 @@ import javax.servlet.http.HttpServletReq
 
 public interface AutoProvision {
 
-  public boolean execute(HttpServletRequest request);
+  boolean execute(HttpServletRequest request);
   
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererFactory.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererFactory.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererFactory.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererFactory.java Fri Jul 19 11:01:23 2013
@@ -40,7 +40,7 @@ public interface RendererFactory {
      * while trying to find a renderer.  It is up to the factory itself to
      * report any relevant exceptions itself.
      */
-    public Renderer getRenderer(Template template, 
+    Renderer getRenderer(Template template,
 		MobileDeviceRepository.DeviceType deviceType);
     
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RequestMapper.java Fri Jul 19 11:01:23 2013
@@ -20,7 +20,7 @@ public interface RequestMapper {
      * wants to.  If action is taken then the RequestMapper should return a 
      * boolean "true" value indicating that no further action is required.
      */
-    public boolean handleRequest(HttpServletRequest req, HttpServletResponse res)
+    boolean handleRequest(HttpServletRequest req, HttpServletResponse res)
         throws ServletException, IOException;
     
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java Fri Jul 19 11:01:23 2013
@@ -126,7 +126,7 @@ public class LRUCache2
     }
     public interface Environment
     {
-        public long getCurrentTimeInMillis();
+        long getCurrentTimeInMillis();
     }
     public static class DefaultEnvironment implements Environment
     {

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java Fri Jul 19 11:01:23 2013
@@ -30,6 +30,6 @@ import java.util.Map;
  */
 public interface CacheFactory {
     
-    public Cache constructCache(Map properties);
+    Cache constructCache(Map properties);
     
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java?rev=1504827&r1=1504826&r2=1504827&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java Fri Jul 19 11:01:23 2013
@@ -36,17 +36,17 @@ import org.apache.roller.weblogger.webse
  */
 public class UserEntry extends Entry {
     /** XML tags that define a user entry. */
-    static interface Tags {
-        public static final String USER = "user";
-        public static final String NAME = "name";
-        public static final String SCREEN_NAME = "screen-name";
-        public static final String FULL_NAME = "full-name";
-        public static final String PASSWORD = "password";
-        public static final String EMAIL_ADDRESS = "email-address";
-        public static final String LOCALE = "locale";
-        public static final String TIMEZONE = "timezone";
-        public static final String DATE_CREATED = "date-created";
-        public static final String ENABLED = "enabled";
+    interface Tags {
+        String USER = "user";
+        String NAME = "name";
+        String SCREEN_NAME = "screen-name";
+        String FULL_NAME = "full-name";
+        String PASSWORD = "password";
+        String EMAIL_ADDRESS = "email-address";
+        String LOCALE = "locale";
+        String TIMEZONE = "timezone";
+        String DATE_CREATED = "date-created";
+        String ENABLED = "enabled";
     }
     
     private String name;