svn commit: r935258 - in /roller/trunk: weblogger-business/src/main/java/org/apache/roller/weblogger/util/cache/ weblogger-business/src/test/java/org/apache/roller/weblogger/business/ weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/...

[sn...@apache.org]

Author: snoopdave
Date: Sat Apr 17 21:34:38 2010
New Revision: 935258

URL: http://svn.apache.org/viewvc?rev=935258&view=rev
Log:
Fixing a couple of compile warnings. See also http://markmail.org/message/aiiw47wiwi7xfwpt

Modified:
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java
    roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java?rev=935258&r1=935257&r2=935258&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java Sat Apr 17 21:34:38 2010
@@ -56,6 +56,7 @@ public class ExpiringLRUCacheImpl extend
      * We wrap the cached object in our ExpiringCacheEntry object so that we
      * can track when the entry has expired.
      */
+    @Override
     public synchronized void put(String key, Object value) {
         
         ExpiringCacheEntry entry = new ExpiringCacheEntry(value, this.timeout);
@@ -69,7 +70,8 @@ public class ExpiringLRUCacheImpl extend
      * This LRU cache supports timeouts, so if the cached object has expired
      * then we return null, just as if the entry wasn't found.
      */
-    public Object get(String key) {
+    @Override
+    public synchronized Object get(String key) {
         
         Object value = null;
         ExpiringCacheEntry entry = null;

Modified: roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java?rev=935258&r1=935257&r2=935258&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java (original)
+++ roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java Sat Apr 17 21:34:38 2010
@@ -50,6 +50,7 @@ public class FileContentManagerTest exte
         return new TestSuite(FileContentManagerTest.class);
     }
 
+    @Override
     public void setUp() throws Exception {
 
         // setup weblogger
@@ -57,9 +58,10 @@ public class FileContentManagerTest exte
 
     }
 
+    @Override
     public void tearDown() throws Exception {
         PropertiesManager pmgr = WebloggerFactory.getWeblogger().getPropertiesManager();
-        Map config = config = pmgr.getProperties();
+        Map config = pmgr.getProperties();
         ((RuntimeConfigProperty) config.get("uploads.dir.maxsize")).setValue("30000");
         ((RuntimeConfigProperty) config.get("uploads.types.forbid")).setValue("");
         ((RuntimeConfigProperty) config.get("uploads.types.allowed")).setValue("");
@@ -144,7 +146,7 @@ public class FileContentManagerTest exte
 
         FileContentManager fmgr = WebloggerFactory.getWeblogger().getFileContentManager();
         PropertiesManager pmgr = WebloggerFactory.getWeblogger().getPropertiesManager();
-        Map config = config = pmgr.getProperties();
+        Map config = pmgr.getProperties();
         ((RuntimeConfigProperty) config.get("uploads.dir.maxsize")).setValue("1.00");
         ((RuntimeConfigProperty) config.get("uploads.types.forbid")).setValue("");
         ((RuntimeConfigProperty) config.get("uploads.types.allowed")).setValue("");

Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java?rev=935258&r1=935257&r2=935258&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java Sat Apr 17 21:34:38 2010
@@ -35,19 +35,15 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import javax.activation.FileTypeMap;
-import javax.activation.MimetypesFileTypeMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.URLStrategy;
 import org.apache.roller.weblogger.business.WeblogEntryManager;
 import org.apache.roller.weblogger.business.Weblogger;
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.business.search.IndexManager;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
-import org.apache.roller.weblogger.pojos.ThemeResource;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -170,7 +166,7 @@ public class EntryCollection {
             if (!RollerAtomHandler.canView(user, website)) {
                 throw new AtomNotAuthorizedException("Not authorized to access website: " + handle);
             }
-            List entries = entries = roller.getWeblogEntryManager().getWeblogEntries( 
+            List entries = roller.getWeblogEntryManager().getWeblogEntries( 
                     website,           // website
                     null,              // user
                     null,              // startDate