commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1584220 [1/3] - in /commons/proper/jcs/trunk/src/java/org/apache/commons/jcs: access/ admin/ auxiliary/ auxiliary/disk/ auxiliary/disk/block/ auxiliary/disk/file/ auxiliary/disk/indexed/ auxiliary/disk/jdbc/ auxiliary/disk/jdbc/hsql/ auxil...
Date Thu, 03 Apr 2014 00:04:05 GMT
Author: sebb
Date: Thu Apr  3 00:04:02 2014
New Revision: 1584220

URL: http://svn.apache.org/r1584220
Log:
Add missing Java 1.6 @Override annotations

Modified:
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/AbstractCacheAccess.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/CacheAccess.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/GroupCacheAccess.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/admin/JCSAdminBean.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptor.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerAbstractTemplate.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheRestore.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TCPLateralCacheAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/CommonRemoteCacheAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheListener.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServerAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheService.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RegistryKeepAliveRunner.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheAdaptor.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheElement.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheElementSerialized.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheEventQueue.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CompositeCacheAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/ElementAttributes.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/ZombieCacheService.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/ZombieCacheWatch.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/event/ElementEvent.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/event/ElementEventQueue.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpl.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThread.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/stats/CacheStats.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/stats/StatElement.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/stats/Stats.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/access/AbstractJCSWorkerHelper.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPCleanupRunner.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderThread.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryService.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/props/PropertiesFactoryFileImpl.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/serialization/CompressingSerializer.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/serialization/StandardSerializer.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/servlet/JCSServletContextListener.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/struct/LRUMap.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/struct/LRUMapEntry.java
    commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolManager.java

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/AbstractCacheAccess.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/AbstractCacheAccess.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/AbstractCacheAccess.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/AbstractCacheAccess.java Thu Apr  3 00:04:02 2014
@@ -65,6 +65,7 @@ public abstract class AbstractCacheAcces
      * <p>
      * @throws CacheException
      */
+    @Override
     public void clear()
         throws CacheException
     {
@@ -88,6 +89,7 @@ public abstract class AbstractCacheAcces
      * @param attr the default attributes.
      * @throws CacheException if something goes wrong.
      */
+    @Override
     public void setDefaultElementAttributes( IElementAttributes attr )
         throws CacheException
     {
@@ -104,6 +106,7 @@ public abstract class AbstractCacheAcces
      * @return the default element attributes used by this region.
      * @throws CacheException
      */
+    @Override
     public IElementAttributes getDefaultElementAttributes()
         throws CacheException
     {
@@ -117,6 +120,7 @@ public abstract class AbstractCacheAcces
      * <p>
      * @return ICacheStats
      */
+    @Override
     public ICacheStats getStatistics()
     {
         return this.cacheControl.getStatistics();
@@ -125,6 +129,7 @@ public abstract class AbstractCacheAcces
     /**
      * @return A String version of the stats.
      */
+    @Override
     public String getStats()
     {
         return this.cacheControl.getStats();
@@ -136,6 +141,7 @@ public abstract class AbstractCacheAcces
      * <p>
      * To simply remove all elements from the region use clear().
      */
+    @Override
     public void dispose()
     {
         this.cacheControl.dispose();
@@ -147,6 +153,7 @@ public abstract class AbstractCacheAcces
      * @return ICompositeCacheAttributes, the controllers config info, defined in the top section of
      *         a region definition.
      */
+    @Override
     public ICompositeCacheAttributes getCacheAttributes()
     {
         return this.cacheControl.getCacheAttributes();
@@ -157,6 +164,7 @@ public abstract class AbstractCacheAcces
      * <p>
      * @param cattr The new ICompositeCacheAttribute value
      */
+    @Override
     public void setCacheAttributes( ICompositeCacheAttributes cattr )
     {
         this.cacheControl.setCacheAttributes( cattr );
@@ -172,6 +180,7 @@ public abstract class AbstractCacheAcces
      *         get 3.
      * @throws CacheException
      */
+    @Override
     public int freeMemoryElements( int numberToFree )
         throws CacheException
     {

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/CacheAccess.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/CacheAccess.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/CacheAccess.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/CacheAccess.java Thu Apr  3 00:04:02 2014
@@ -71,6 +71,7 @@ public class CacheAccess<K extends Seria
      * @param name Key the object is stored as
      * @return The object if found or null
      */
+    @Override
     public V get( K name )
     {
         ICacheElement<K, V> element = this.cacheControl.get( name );
@@ -84,6 +85,7 @@ public class CacheAccess<K extends Seria
      * @param pattern - a key pattern for the objects stored
      * @return A map of key to values.  These are stripped from the wrapper.
      */
+    @Override
     public Map<K, V> getMatching( String pattern )
     {
         HashMap<K, V> unwrappedResults = new HashMap<K, V>();
@@ -118,6 +120,7 @@ public class CacheAccess<K extends Seria
      * @param name Key the Serializable is stored as
      * @return The ICacheElement<K, V> if the object is found or null
      */
+    @Override
     public ICacheElement<K, V> getCacheElement( K name )
     {
         return this.cacheControl.get( name );
@@ -140,6 +143,7 @@ public class CacheAccess<K extends Seria
      * @param names set of Serializable cache keys
      * @return a map of K key to ICacheElement<K, V> element, or empty map if none of the keys are present
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getCacheElements( Set<K> names )
     {
         return this.cacheControl.getMultiple( names );
@@ -162,6 +166,7 @@ public class CacheAccess<K extends Seria
      * @param pattern key search pattern
      * @return a map of K key to ICacheElement<K, V> element, or empty map if no keys match the pattern
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getMatchingCacheElements( String pattern )
     {
         return this.cacheControl.getMatching( pattern );
@@ -177,6 +182,7 @@ public class CacheAccess<K extends Seria
      * @throws CacheException and ObjectExistsException is thrown if the item is already in the
      *                cache.
      */
+    @Override
     public void putSafe( K key, V value )
         throws CacheException
     {
@@ -196,6 +202,7 @@ public class CacheAccess<K extends Seria
      * @param obj Object to store
      * @throws CacheException
      */
+    @Override
     public void put( K name, V obj )
         throws CacheException
     {
@@ -212,6 +219,7 @@ public class CacheAccess<K extends Seria
      * @see org.apache.commons.jcs.access.behavior.ICacheAccess#put(java.io.Serializable, java.io.Serializable,
      *      org.apache.commons.jcs.engine.behavior.IElementAttributes)
      */
+    @Override
     public void put( K key, V val, IElementAttributes attr )
         throws CacheException
     {
@@ -248,6 +256,7 @@ public class CacheAccess<K extends Seria
      * @param name the name of the item to remove.
      * @throws CacheException
      */
+    @Override
     public void remove( K name )
         throws CacheException
     {
@@ -263,6 +272,7 @@ public class CacheAccess<K extends Seria
      * @throws CacheException
      * @throws InvalidHandleException if the item does not exist.
      */
+    @Override
     public void resetElementAttributes( K name, IElementAttributes attr )
         throws CacheException, InvalidHandleException
     {
@@ -290,6 +300,7 @@ public class CacheAccess<K extends Seria
      * @return Attributes for the object, null if object not in cache
      * @throws CacheException
      */
+    @Override
     public IElementAttributes getElementAttributes( K name )
         throws CacheException
     {

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/GroupCacheAccess.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/GroupCacheAccess.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/GroupCacheAccess.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/GroupCacheAccess.java Thu Apr  3 00:04:02 2014
@@ -60,6 +60,7 @@ public class GroupCacheAccess<K extends 
      *            The group name.
      * @return The cached value, null if not found.
      */
+    @Override
     public V getFromGroup( K name, String group )
     {
         ICacheElement<GroupAttrName<K>, V> element = this.cacheControl.get( getGroupAttrName( group, name ) );
@@ -92,6 +93,7 @@ public class GroupCacheAccess<K extends 
      *            The object to cache
      * @throws CacheException
      */
+    @Override
     public void putInGroup( K name, String groupName, V value )
         throws CacheException
     {
@@ -113,6 +115,7 @@ public class GroupCacheAccess<K extends 
      *            The objects attributes.
      * @throws CacheException
      */
+    @Override
     public void putInGroup( K name, String groupName, V value, IElementAttributes attr )
         throws CacheException
     {
@@ -150,6 +153,7 @@ public class GroupCacheAccess<K extends 
      * @param name
      * @param group
      */
+    @Override
     public void removeFromGroup( K name, String group )
     {
         GroupAttrName<K> key = getGroupAttrName( group, name );
@@ -162,6 +166,7 @@ public class GroupCacheAccess<K extends 
      * @param group
      * @return A Set of keys.
      */
+    @Override
     public Set<K> getGroupKeys( String group )
     {
         Set<K> groupKeys = new HashSet<K>();
@@ -199,6 +204,7 @@ public class GroupCacheAccess<K extends 
      * @param group
      *            The name of the group to invalidate
      */
+    @Override
     public void invalidateGroup( String group )
     {
         this.cacheControl.remove(getGroupAttrName(group, null));

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java Thu Apr  3 00:04:02 2014
@@ -92,6 +92,7 @@ public class PartitionedCacheAccess<K ex
      * @param object object
      * @throws CacheException on configuration problem
      */
+    @Override
     public void put( K key, V object )
         throws CacheException
     {
@@ -125,6 +126,7 @@ public class PartitionedCacheAccess<K ex
      * @param object
      * @throws CacheException
      */
+    @Override
     public void putSafe( K key, V object )
         throws CacheException
     {
@@ -150,6 +152,7 @@ public class PartitionedCacheAccess<K ex
      * @param attr
      * @throws CacheException on configuration problem
      */
+    @Override
     public void put( K key, V object, IElementAttributes attr )
         throws CacheException
     {
@@ -183,6 +186,7 @@ public class PartitionedCacheAccess<K ex
      * @param key key
      * @return result, null if not found.
      */
+    @Override
     public V get( K key )
     {
         if ( key == null )
@@ -207,6 +211,7 @@ public class PartitionedCacheAccess<K ex
      * @param key key
      * @return result, null if not found.
      */
+    @Override
     public ICacheElement<K, V> getCacheElement( K key )
     {
         if ( key == null )
@@ -231,6 +236,7 @@ public class PartitionedCacheAccess<K ex
      * @param names
      * @return Map of keys to ICacheElement
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getCacheElements( Set<K> names )
     {
         if ( names == null )
@@ -277,6 +283,7 @@ public class PartitionedCacheAccess<K ex
      * @param pattern
      * @return HashMap key to value
      */
+    @Override
     public Map<K, V> getMatching( String pattern )
     {
         if ( pattern == null )
@@ -305,6 +312,7 @@ public class PartitionedCacheAccess<K ex
      * @param pattern
      * @return HashMap key to ICacheElement
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getMatchingCacheElements( String pattern )
     {
         if ( pattern == null )
@@ -332,6 +340,7 @@ public class PartitionedCacheAccess<K ex
      * @param key
      * @throws CacheException
      */
+    @Override
     public void remove( K key )
         throws CacheException
     {
@@ -365,6 +374,7 @@ public class PartitionedCacheAccess<K ex
      * @return number removed
      * @throws CacheException
      */
+    @Override
     public int freeMemoryElements( int numberToFree )
         throws CacheException
     {
@@ -384,6 +394,7 @@ public class PartitionedCacheAccess<K ex
     /**
      * @return ICompositeCacheAttributes from the first partition.
      */
+    @Override
     public ICompositeCacheAttributes getCacheAttributes()
     {
         if (!ensureInit())
@@ -403,6 +414,7 @@ public class PartitionedCacheAccess<K ex
      * @return IElementAttributes from the first partition.
      * @throws CacheException
      */
+    @Override
     public IElementAttributes getDefaultElementAttributes()
         throws CacheException
     {
@@ -426,6 +438,7 @@ public class PartitionedCacheAccess<K ex
      * @return IElementAttributes
      * @throws CacheException
      */
+    @Override
     public IElementAttributes getElementAttributes( K key )
         throws CacheException
     {
@@ -453,6 +466,7 @@ public class PartitionedCacheAccess<K ex
      * @param attributes
      * @throws CacheException
      */
+    @Override
     public void resetElementAttributes( K key, IElementAttributes attributes )
         throws CacheException
     {
@@ -477,6 +491,7 @@ public class PartitionedCacheAccess<K ex
      * <p>
      * @param cattr
      */
+    @Override
     public void setCacheAttributes( ICompositeCacheAttributes cattr )
     {
         if (!ensureInit())
@@ -495,6 +510,7 @@ public class PartitionedCacheAccess<K ex
      * <p>
      * @throws CacheException
      */
+    @Override
     public void clear()
         throws CacheException
     {
@@ -519,6 +535,7 @@ public class PartitionedCacheAccess<K ex
      * @param attr the default attributes.
      * @throws CacheException if something goes wrong.
      */
+    @Override
     public void setDefaultElementAttributes( IElementAttributes attr )
         throws CacheException
     {
@@ -540,6 +557,7 @@ public class PartitionedCacheAccess<K ex
      * <p>
      * @return ICacheStats
      */
+    @Override
     public ICacheStats getStatistics()
     {
         if (!ensureInit())
@@ -558,6 +576,7 @@ public class PartitionedCacheAccess<K ex
     /**
      * @return A String version of the stats.
      */
+    @Override
     public String getStats()
     {
         if (!ensureInit())
@@ -581,6 +600,7 @@ public class PartitionedCacheAccess<K ex
      * <p>
      * To simply remove all elements from the region use clear().
      */
+    @Override
     public synchronized void dispose()
     {
         if (!ensureInit())

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/admin/JCSAdminBean.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/admin/JCSAdminBean.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/admin/JCSAdminBean.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/admin/JCSAdminBean.java Thu Apr  3 00:04:02 2014
@@ -83,6 +83,7 @@ public class JCSAdminBean implements JCS
      * @return Array of CacheElementInfo objects
      * @throws Exception
      */
+    @Override
     public CacheElementInfo[] buildElementInfo( String cacheName )
         throws Exception
     {
@@ -138,6 +139,7 @@ public class JCSAdminBean implements JCS
      * @return list of CacheRegionInfo objects
      * @throws Exception
      */
+    @Override
     public CacheRegionInfo[] buildCacheInfo()
         throws Exception
     {
@@ -179,7 +181,8 @@ public class JCSAdminBean implements JCS
      *
      * @return int The size of the region in bytes.
      */
-	public int getByteCount(String cacheName)
+	@Override
+    public int getByteCount(String cacheName)
 	{
 		return getByteCount(cacheHub.getCache(cacheName));
 	}
@@ -280,6 +283,7 @@ public class JCSAdminBean implements JCS
      * API, so that removes will be broadcast to client machines. Otherwise clears all regions in the cache directly via
      * the usual cache API.
      */
+    @Override
     public void clearAllRegions() throws IOException
     {
         if (RemoteCacheServerFactory.getRemoteCacheServer() == null)
@@ -324,6 +328,7 @@ public class JCSAdminBean implements JCS
      * API, so that removes will be broadcast to client machines. Otherwise clears the region directly via the usual
      * cache API.
      */
+    @Override
     public void clearRegion(String cacheName) throws IOException
     {
         if (cacheName == null)
@@ -365,6 +370,7 @@ public class JCSAdminBean implements JCS
      *
      * @throws IOException
      */
+    @Override
     public void removeItem(String cacheName, String key) throws IOException
     {
         if (cacheName == null)

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java Thu Apr  3 00:04:02 2014
@@ -143,6 +143,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @param cacheEventLogger
      */
+    @Override
     public void setCacheEventLogger( ICacheEventLogger cacheEventLogger )
     {
         this.cacheEventLogger = cacheEventLogger;
@@ -166,6 +167,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @param elementSerializer
      */
+    @Override
     public void setElementSerializer( IElementSerializer elementSerializer )
     {
         if ( elementSerializer != null )
@@ -189,6 +191,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @param keyMatcher
      */
+    @Override
     public void setKeyMatcher( IKeyMatcher<K> keyMatcher )
     {
         if ( keyMatcher != null )

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java Thu Apr  3 00:04:02 2014
@@ -45,6 +45,7 @@ public abstract class AbstractAuxiliaryC
     /**
      * @param name
      */
+    @Override
     public void setCacheName( String name )
     {
         this.cacheName = name;
@@ -55,6 +56,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @return The cacheName value
      */
+    @Override
     public String getCacheName()
     {
         return this.cacheName;
@@ -65,6 +67,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes#setName(java.lang.String)
      */
+    @Override
     public void setName( String s )
     {
         this.name = s;
@@ -75,6 +78,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @return The name value
      */
+    @Override
     public String getName()
     {
         return this.name;
@@ -85,6 +89,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @param queueType SINGLE or POOLED
      */
+    @Override
     public void setEventQueueType( ICacheEventQueue.QueueType queueType )
     {
         this.eventQueueType = queueType;
@@ -93,6 +98,7 @@ public abstract class AbstractAuxiliaryC
     /**
      * @return SINGLE or POOLED
      */
+    @Override
     public ICacheEventQueue.QueueType getEventQueueType()
     {
         return eventQueueType;
@@ -104,6 +110,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @param s SINGLE or POOLED
      */
+    @Override
     public void setEventQueuePoolName( String s )
     {
         eventQueuePoolName = s;
@@ -115,6 +122,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @return name of thread pool to use for this auxiliary
      */
+    @Override
     public String getEventQueuePoolName()
     {
         return eventQueuePoolName;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java Thu Apr  3 00:04:02 2014
@@ -43,6 +43,7 @@ public abstract class AbstractAuxiliaryC
      * @param cacheElement
      * @throws IOException
      */
+    @Override
     public void update( ICacheElement<K, V> cacheElement )
         throws IOException
     {
@@ -85,6 +86,7 @@ public abstract class AbstractAuxiliaryC
      * @return ICacheElement, a wrapper around the key, value, and attributes
      * @throws IOException
      */
+    @Override
     public ICacheElement<K, V> get( K key )
         throws IOException
     {
@@ -130,6 +132,7 @@ public abstract class AbstractAuxiliaryC
      *         data in cache for any of these keys
      * @throws IOException
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys)
         throws IOException
     {
@@ -184,6 +187,7 @@ public abstract class AbstractAuxiliaryC
      *         data matching the pattern.
      * @throws IOException
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getMatching( String pattern )
         throws IOException
     {
@@ -230,6 +234,7 @@ public abstract class AbstractAuxiliaryC
      * @return boolean, whether or not the item was removed
      * @throws IOException
      */
+    @Override
     public boolean remove( K key )
         throws IOException
     {
@@ -272,6 +277,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @throws IOException
      */
+    @Override
     public void removeAll()
         throws IOException
     {
@@ -310,6 +316,7 @@ public abstract class AbstractAuxiliaryC
      * <p>
      * @throws IOException
      */
+    @Override
     public void dispose()
         throws IOException
     {

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java Thu Apr  3 00:04:02 2014
@@ -361,6 +361,7 @@ public abstract class AbstractDiskCache<
      * <p>
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getKeySet()
      */
+    @Override
     public abstract Set<K> getKeySet() throws IOException;
 
     /**
@@ -454,6 +455,7 @@ public abstract class AbstractDiskCache<
     {
         Runnable disR = new Runnable()
         {
+            @Override
             public void run()
             {
                 boolean keepGoing = true;
@@ -503,6 +505,7 @@ public abstract class AbstractDiskCache<
      * @return the region name.
      * @see ICache#getCacheName
      */
+    @Override
     public String getCacheName()
     {
         return cacheName;
@@ -513,6 +516,7 @@ public abstract class AbstractDiskCache<
      * <p>
      * @return String
      */
+    @Override
     public String getStats()
     {
         return getStatistics().toString();
@@ -523,6 +527,7 @@ public abstract class AbstractDiskCache<
      * <p>
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getStatistics()
      */
+    @Override
     public IStats getStatistics()
     {
         IStats stats = new Stats();
@@ -560,6 +565,7 @@ public abstract class AbstractDiskCache<
      * @return the status -- alive or disposed from CacheConstants
      * @see ICache#getStatus
      */
+    @Override
     public CacheStatus getStatus()
     {
         return ( alive ? CacheStatus.ALIVE : CacheStatus.DISPOSED );
@@ -572,12 +578,14 @@ public abstract class AbstractDiskCache<
      * @return the number of items.
      * @see ICache#getSize
      */
+    @Override
     public abstract int getSize();
 
     /**
      * @see org.apache.commons.jcs.engine.behavior.ICacheType#getCacheType
      * @return Always returns DISK_CACHE since subclasses should all be of that type.
      */
+    @Override
     public CacheType getCacheType()
     {
         return CacheType.DISK_CACHE;
@@ -598,6 +606,7 @@ public abstract class AbstractDiskCache<
          * @throws IOException
          * @see ICacheListener#getListenerId
          */
+        @Override
         public long getListenerId()
             throws IOException
         {
@@ -609,6 +618,7 @@ public abstract class AbstractDiskCache<
          * @throws IOException
          * @see ICacheListener#setListenerId
          */
+        @Override
         public void setListenerId( long id )
             throws IOException
         {
@@ -623,6 +633,7 @@ public abstract class AbstractDiskCache<
          *      added to the cache event queue, that may not be needed ( they are always
          *      PurgatoryElements ).
          */
+        @Override
         public void handlePut( ICacheElement<K, V> element )
             throws IOException
         {
@@ -705,6 +716,7 @@ public abstract class AbstractDiskCache<
          * @throws IOException
          * @see ICacheListener#handleRemove
          */
+        @Override
         public void handleRemove( String cacheName, K key )
             throws IOException
         {
@@ -722,6 +734,7 @@ public abstract class AbstractDiskCache<
          * @throws IOException
          * @see ICacheListener#handleRemoveAll
          */
+        @Override
         public void handleRemoveAll( String cacheName )
             throws IOException
         {
@@ -736,6 +749,7 @@ public abstract class AbstractDiskCache<
          * @throws IOException
          * @see ICacheListener#handleDispose
          */
+        @Override
         public void handleDispose( String cacheName )
             throws IOException
         {

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheAttributes.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheAttributes.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheAttributes.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheAttributes.java Thu Apr  3 00:04:02 2014
@@ -63,6 +63,7 @@ public abstract class AbstractDiskCacheA
      * <p>
      * @param path The new diskPath value
      */
+    @Override
     public void setDiskPath( String path )
     {
         setDiskPath( new File( path ) );
@@ -89,6 +90,7 @@ public abstract class AbstractDiskCacheA
      * <p>
      * @return The diskPath value
      */
+    @Override
     public File getDiskPath()
     {
         return this.diskPath;
@@ -99,6 +101,7 @@ public abstract class AbstractDiskCacheA
      * <p>
      * @return The maxPurgatorySize value
      */
+    @Override
     public int getMaxPurgatorySize()
     {
         return maxPurgatorySize;
@@ -109,6 +112,7 @@ public abstract class AbstractDiskCacheA
      * <p>
      * @param maxPurgatorySize The new maxPurgatorySize value
      */
+    @Override
     public void setMaxPurgatorySize( int maxPurgatorySize )
     {
         this.maxPurgatorySize = maxPurgatorySize;
@@ -120,6 +124,7 @@ public abstract class AbstractDiskCacheA
      * <p>
      * @return the time in seconds.
      */
+    @Override
     public int getShutdownSpoolTimeLimit()
     {
         return this.shutdownSpoolTimeLimit;
@@ -135,6 +140,7 @@ public abstract class AbstractDiskCacheA
      * <p>
      * @param shutdownSpoolTimeLimit the time in seconds
      */
+    @Override
     public void setShutdownSpoolTimeLimit( int shutdownSpoolTimeLimit )
     {
         this.shutdownSpoolTimeLimit = shutdownSpoolTimeLimit;
@@ -145,6 +151,7 @@ public abstract class AbstractDiskCacheA
      * <p>
      * @return AuxiliaryCacheAttributes
      */
+    @Override
     public AuxiliaryCacheAttributes copy()
     {
         try
@@ -161,6 +168,7 @@ public abstract class AbstractDiskCacheA
     /**
      * @param allowRemoveAll The allowRemoveAll to set.
      */
+    @Override
     public void setAllowRemoveAll( boolean allowRemoveAll )
     {
         this.allowRemoveAll = allowRemoveAll;
@@ -169,6 +177,7 @@ public abstract class AbstractDiskCacheA
     /**
      * @return Returns the allowRemoveAll.
      */
+    @Override
     public boolean isAllowRemoveAll()
     {
         return allowRemoveAll;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java Thu Apr  3 00:04:02 2014
@@ -88,6 +88,7 @@ public class PurgatoryElement<K extends 
      * @return cacheElement.getCacheName();
      * @see ICacheElement#getCacheName
      */
+    @Override
     public String getCacheName()
     {
         return cacheElement.getCacheName();
@@ -97,6 +98,7 @@ public class PurgatoryElement<K extends 
      * @return cacheElement.getKey();
      * @see ICacheElement#getKey
      */
+    @Override
     public K getKey()
     {
         return cacheElement.getKey();
@@ -106,6 +108,7 @@ public class PurgatoryElement<K extends 
      * @return cacheElement.getVal();
      * @see ICacheElement#getVal
      */
+    @Override
     public V getVal()
     {
         return cacheElement.getVal();
@@ -115,6 +118,7 @@ public class PurgatoryElement<K extends 
      * @return cacheElement.getElementAttributes();
      * @see ICacheElement#getElementAttributes
      */
+    @Override
     public IElementAttributes getElementAttributes()
     {
         return cacheElement.getElementAttributes();
@@ -124,6 +128,7 @@ public class PurgatoryElement<K extends 
      * @param attr
      * @see ICacheElement#setElementAttributes
      */
+    @Override
     public void setElementAttributes( IElementAttributes attr )
     {
         cacheElement.setElementAttributes( attr );

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java Thu Apr  3 00:04:02 2014
@@ -163,6 +163,7 @@ public class BlockDiskCache<K extends Se
     /**
      * @see org.apache.commons.jcs.engine.behavior.IRequireScheduler#setScheduledExecutorService(java.util.concurrent.ScheduledExecutorService)
      */
+    @Override
     public void setScheduledExecutorService(ScheduledExecutorService scheduledExecutor)
     {
         // add this region to the persistence thread.
@@ -172,6 +173,7 @@ public class BlockDiskCache<K extends Se
             scheduledExecutor.scheduleAtFixedRate(
                     new Runnable()
                     {
+                        @Override
                         public void run()
                         {
                             keyStore.saveKeys();
@@ -542,6 +544,7 @@ public class BlockDiskCache<K extends Se
     {
         Runnable disR = new Runnable()
         {
+            @Override
             public void run()
             {
                 try
@@ -622,6 +625,7 @@ public class BlockDiskCache<K extends Se
      * (non-Javadoc)
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getAuxiliaryCacheAttributes()
      */
+    @Override
     public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
     {
         return this.blockDiskCacheAttributes;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java Thu Apr  3 00:04:02 2014
@@ -58,6 +58,7 @@ public class BlockDiskCacheFactory
      * @param elementSerializer
      * @return AuxiliaryCache
      */
+    @Override
     public <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> createCache( AuxiliaryCacheAttributes iaca, ICompositeCacheManager cacheMgr,
                                        ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer )
     {
@@ -75,6 +76,7 @@ public class BlockDiskCacheFactory
      * <p>
      * @return The name value
      */
+    @Override
     public String getName()
     {
         return this.name;
@@ -85,6 +87,7 @@ public class BlockDiskCacheFactory
      * <p>
      * @param name The new name value
      */
+    @Override
     public void setName( String name )
     {
         this.name = name;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManager.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManager.java Thu Apr  3 00:04:02 2014
@@ -94,6 +94,7 @@ public class BlockDiskCacheManager
      * @param cacheName Name that will be used when creating attributes.
      * @return A cache.
      */
+    @Override
     public <K extends Serializable, V extends Serializable> BlockDiskCache<K, V> getCache( String cacheName )
     {
         BlockDiskCacheAttributes cacheAttributes = (BlockDiskCacheAttributes) defaultCacheAttributes.copy();

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptor.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptor.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptor.java Thu Apr  3 00:04:02 2014
@@ -107,6 +107,7 @@ public class BlockDiskElementDescriptor<
      * (non-Javadoc)
      * @see java.io.Externalizable#readExternal(java.io.ObjectInput)
      */
+    @Override
     @SuppressWarnings("unchecked") // Need cast to K
     public void readExternal( ObjectInput input )
         throws IOException, ClassNotFoundException
@@ -121,6 +122,7 @@ public class BlockDiskElementDescriptor<
      * (non-Javadoc)
      * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
      */
+    @Override
     public void writeExternal( ObjectOutput output )
         throws IOException
     {

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCache.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCache.java Thu Apr  3 00:04:02 2014
@@ -179,6 +179,7 @@ public class FileDiskCache<K extends Ser
     /**
      * @return AuxiliaryCacheAttributes
      */
+    @Override
     public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
     {
         return diskFileCacheAttributes;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactory.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactory.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactory.java Thu Apr  3 00:04:02 2014
@@ -53,6 +53,7 @@ public class FileDiskCacheFactory
      * @param elementSerializer the serializer
      * @return AuxiliaryCache
      */
+    @Override
     public <K extends Serializable, V extends Serializable> FileDiskCache<K, V> createCache(
             AuxiliaryCacheAttributes attr, ICompositeCacheManager cacheMgr,
            ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer )
@@ -81,6 +82,7 @@ public class FileDiskCacheFactory
      * <p>
      * @return The name value
      */
+    @Override
     public String getName()
     {
         return this.name;
@@ -91,6 +93,7 @@ public class FileDiskCacheFactory
      * <p>
      * @param name The new name value
      */
+    @Override
     public void setName( String name )
     {
         this.name = name;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java Thu Apr  3 00:04:02 2014
@@ -68,6 +68,7 @@ public class FileDiskCacheManager
      * @param cacheName Name that will be used when creating attributes.
      * @return A cache.
      */
+    @Override
     public <K extends Serializable, V extends Serializable> FileDiskCache<K, V> getCache( String cacheName )
     {
         FileDiskCacheAttributes cacheAttributes = (FileDiskCacheAttributes) defaultCacheAttributes.copy();

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java Thu Apr  3 00:04:02 2014
@@ -1049,6 +1049,7 @@ public class IndexedDiskCache<K extends 
         {
             Runnable disR = new Runnable()
             {
+                @Override
                 public void run()
                 {
                     disposeInternal();
@@ -1189,6 +1190,7 @@ public class IndexedDiskCache<K extends 
                     {
                         currentOptimizationThread = new Thread( new Runnable()
                         {
+                            @Override
                             public void run()
                             {
                                 optimizeFile();
@@ -1521,6 +1523,7 @@ public class IndexedDiskCache<K extends 
     /**
      * @return Returns the AuxiliaryCacheAttributes.
      */
+    @Override
     public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
     {
         return this.cattr;
@@ -1674,6 +1677,7 @@ public class IndexedDiskCache<K extends 
          * <p>
          * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
          */
+        @Override
         public int compare( IndexedDiskElementDescriptor o1, IndexedDiskElementDescriptor o2 )
         {
             IndexedDiskElementDescriptor ded1 = o1;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java Thu Apr  3 00:04:02 2014
@@ -58,6 +58,7 @@ public class IndexedDiskCacheFactory
      * @param elementSerializer
      * @return AuxiliaryCache
      */
+    @Override
     public <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> createCache( AuxiliaryCacheAttributes iaca, ICompositeCacheManager cacheMgr,
                                        ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer )
     {
@@ -75,6 +76,7 @@ public class IndexedDiskCacheFactory
      * <p>
      * @return The name value
      */
+    @Override
     public String getName()
     {
         return this.name;
@@ -85,6 +87,7 @@ public class IndexedDiskCacheFactory
      * <p>
      * @param name The new name value
      */
+    @Override
     public void setName( String name )
     {
         this.name = name;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java Thu Apr  3 00:04:02 2014
@@ -94,6 +94,7 @@ public class IndexedDiskCacheManager
      * @param cacheName Name that will be used when creating attributes.
      * @return A cache.
      */
+    @Override
     public <K extends Serializable, V extends Serializable> IndexedDiskCache<K, V> getCache( String cacheName )
     {
         IndexedDiskCacheAttributes cacheAttributes = (IndexedDiskCacheAttributes) defaultCacheAttributes.copy();

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java Thu Apr  3 00:04:02 2014
@@ -92,6 +92,7 @@ public class IndexedDiskElementDescripto
      * @param o Object
      * @return int
      */
+    @Override
     public int compareTo( IndexedDiskElementDescriptor o )
     {
         if ( o == null )

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java Thu Apr  3 00:04:02 2014
@@ -1104,6 +1104,7 @@ public class JDBCDiskCache<K extends Ser
     /**
      * @return Returns the AuxiliaryCacheAttributes.
      */
+    @Override
     public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
     {
         return this.getJdbcDiskCacheAttributes();

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java Thu Apr  3 00:04:02 2014
@@ -48,6 +48,7 @@ public class JDBCDiskCacheFactory
      * @param elementSerializer
      * @return AuxiliaryCache
      */
+    @Override
     public <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> createCache( AuxiliaryCacheAttributes rawAttr, ICompositeCacheManager compositeCacheManager,
                                        ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer )
     {
@@ -62,6 +63,7 @@ public class JDBCDiskCacheFactory
      * <p>
      * @param nameArg
      */
+    @Override
     public void setName( String nameArg )
     {
         name = nameArg;
@@ -72,6 +74,7 @@ public class JDBCDiskCacheFactory
      * <p>
      * @return String
      */
+    @Override
     public String getName()
     {
         return name;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManager.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManager.java Thu Apr  3 00:04:02 2014
@@ -109,6 +109,7 @@ public class JDBCDiskCacheManager
      * @param cacheName
      * @return The cache value
      */
+    @Override
     public <K extends Serializable, V extends Serializable> JDBCDiskCache<K, V> getCache( String cacheName )
     {
         JDBCDiskCacheAttributes cattr = (JDBCDiskCacheAttributes) defaultJDBCDiskCacheAttributes.copy();

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerAbstractTemplate.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerAbstractTemplate.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerAbstractTemplate.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerAbstractTemplate.java Thu Apr  3 00:04:02 2014
@@ -217,6 +217,7 @@ public abstract class JDBCDiskCacheManag
          * @param runner
          * @return the daemon thread.
          */
+        @Override
         public Thread newThread( Runnable runner )
         {
             Thread t = new Thread( runner );

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java Thu Apr  3 00:04:02 2014
@@ -78,6 +78,7 @@ public class ShrinkerThread
     /**
      * Calls deleteExpired on each item in the set. It pauses between each call.
      */
+    @Override
     public void run()
     {
         try

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java Thu Apr  3 00:04:02 2014
@@ -66,6 +66,7 @@ public class HSQLDiskCacheFactory
      * @param elementSerializer
      * @return AuxiliaryCache
      */
+    @Override
     public <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> createCache( AuxiliaryCacheAttributes rawAttr, ICompositeCacheManager arg1,
                                        ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer )
     {
@@ -89,6 +90,7 @@ public class HSQLDiskCacheFactory
      * <p>
      * @param nameArg
      */
+    @Override
     public void setName( String nameArg )
     {
         name = nameArg;
@@ -99,6 +101,7 @@ public class HSQLDiskCacheFactory
      * <p>
      * @return name
      */
+    @Override
     public String getName()
     {
         return name;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java Thu Apr  3 00:04:02 2014
@@ -48,6 +48,7 @@ public class MySQLDiskCacheFactory
      * @param elementSerializer
      * @return AuxiliaryCache
      */
+    @Override
     public <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> createCache( AuxiliaryCacheAttributes rawAttr, ICompositeCacheManager cacheManager,
                                        ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer )
     {
@@ -60,6 +61,7 @@ public class MySQLDiskCacheFactory
      * <p>
      * @param nameArg
      */
+    @Override
     public void setName( String nameArg )
     {
         name = nameArg;
@@ -70,6 +72,7 @@ public class MySQLDiskCacheFactory
      * <p>
      * @return factory name
      */
+    @Override
     public String getName()
     {
         return name;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java Thu Apr  3 00:04:02 2014
@@ -128,6 +128,7 @@ public class MySQLDiskCacheManager
      * @param cacheName
      * @return The cache value
      */
+    @Override
     @SuppressWarnings("unchecked")
     public <K extends Serializable, V extends Serializable> MySQLDiskCache<K, V> getCache( String cacheName )
     {

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java Thu Apr  3 00:04:02 2014
@@ -211,6 +211,7 @@ public class LateralCache<K extends Seri
      * <p>
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getKeySet()
      */
+    @Override
     public Set<K> getKeySet() throws IOException
     {
         try
@@ -305,6 +306,7 @@ public class LateralCache<K extends Seri
      * <p>
      * @return The status value
      */
+    @Override
     public CacheStatus getStatus()
     {
         return this.lateralCacheService instanceof IZombie ? CacheStatus.ERROR : CacheStatus.ALIVE;
@@ -315,6 +317,7 @@ public class LateralCache<K extends Seri
      * <p>
      * @return The size value
      */
+    @Override
     public int getSize()
     {
         return 0;
@@ -325,6 +328,7 @@ public class LateralCache<K extends Seri
      * <p>
      * @return The cacheType value
      */
+    @Override
     public CacheType getCacheType()
     {
         return CacheType.LATERAL_CACHE;
@@ -335,6 +339,7 @@ public class LateralCache<K extends Seri
      * <p>
      * @return The cacheName value
      */
+    @Override
     public String getCacheName()
     {
         return cacheName;
@@ -404,6 +409,7 @@ public class LateralCache<K extends Seri
      * <p>
      * @return String
      */
+    @Override
     public String getStats()
     {
         return "";
@@ -412,6 +418,7 @@ public class LateralCache<K extends Seri
     /**
      * @return Returns the AuxiliaryCacheAttributes.
      */
+    @Override
     public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
     {
         return lateralCacheAttributes;
@@ -444,6 +451,7 @@ public class LateralCache<K extends Seri
      * <p>
      * @return almost nothing
      */
+    @Override
     public IStats getStatistics()
     {
         IStats stats = new Stats();

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java Thu Apr  3 00:04:02 2014
@@ -59,6 +59,7 @@ public abstract class LateralCacheAbstra
      * @param elementSerializer
      * @return AuxiliaryCache
      */
+    @Override
     public abstract <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> createCache(
             AuxiliaryCacheAttributes attr, ICompositeCacheManager cacheMgr,
             ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer );
@@ -82,6 +83,7 @@ public abstract class LateralCacheAbstra
      * <p>
      * @return The name value
      */
+    @Override
     public String getName()
     {
         return this.name;
@@ -93,6 +95,7 @@ public abstract class LateralCacheAbstra
      * @param name
      *            The new name value
      */
+    @Override
     public void setName( String name )
     {
         this.name = name;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractManager.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAbstractManager.java Thu Apr  3 00:04:02 2014
@@ -109,6 +109,7 @@ public abstract class LateralCacheAbstra
      * @return AuxiliaryCache
      * @param cacheName
      */
+    @Override
     public abstract <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> getCache( String cacheName );
 
     /**
@@ -128,6 +129,7 @@ public abstract class LateralCacheAbstra
      * @param lateralService
      * @param lateralWatch
      */
+    @Override
     @SuppressWarnings("unchecked") // Need downcast to satisfy common interface
     public void fixCaches( ICacheServiceNonLocal<Serializable, Serializable> lateralService, ILateralCacheObserver lateralWatch )
     {
@@ -149,6 +151,7 @@ public abstract class LateralCacheAbstra
      * @return Map
      *
      */
+    @Override
     public Map<String, LateralCacheNoWait<? extends Serializable, ? extends Serializable>> getCaches()
     {
         return caches;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAttributes.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAttributes.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAttributes.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheAttributes.java Thu Apr  3 00:04:02 2014
@@ -76,6 +76,7 @@ public class LateralCacheAttributes
      * <P>
      * @param val The new httpServer value
      */
+    @Override
     public void setHttpServer( String val )
     {
         httpServer = val;
@@ -85,6 +86,7 @@ public class LateralCacheAttributes
      * Gets the httpServer attribute of the LateralCacheAttributes object
      * @return The httpServer value
      */
+    @Override
     public String getHttpServer()
     {
         return httpServer;
@@ -94,6 +96,7 @@ public class LateralCacheAttributes
      * Sets the httpServers attribute of the LateralCacheAttributes object
      * @param val The new httpServers value
      */
+    @Override
     public void setHttpServers( String val )
     {
         httpServers = val;
@@ -103,6 +106,7 @@ public class LateralCacheAttributes
      * Gets the httpSrvers attribute of the LateralCacheAttributes object
      * @return The httpServers value
      */
+    @Override
     public String getHttpServers()
     {
         return httpServers;
@@ -112,6 +116,7 @@ public class LateralCacheAttributes
      * Sets the httpListenerPort attribute of the ILateralCacheAttributes object
      * @param val The new tcpListenerPort value
      */
+    @Override
     public void setHttpListenerPort( int val )
     {
         this.httpListenerPort = val;
@@ -121,6 +126,7 @@ public class LateralCacheAttributes
      * Gets the httpListenerPort attribute of the ILateralCacheAttributes object
      * @return The httpListenerPort value
      */
+    @Override
     public int getHttpListenerPort()
     {
         return this.httpListenerPort;
@@ -130,6 +136,7 @@ public class LateralCacheAttributes
      * Sets the udpMulticastAddr attribute of the LateralCacheAttributes object
      * @param val The new udpMulticastAddr value
      */
+    @Override
     public void setUdpMulticastAddr( String val )
     {
         udpMulticastAddr = val;
@@ -139,6 +146,7 @@ public class LateralCacheAttributes
      * Gets the udpMulticastAddr attribute of the LateralCacheAttributes object
      * @return The udpMulticastAddr value
      */
+    @Override
     public String getUdpMulticastAddr()
     {
         return udpMulticastAddr;
@@ -148,6 +156,7 @@ public class LateralCacheAttributes
      * Sets the udpMulticastPort attribute of the LateralCacheAttributes object
      * @param val The new udpMulticastPort value
      */
+    @Override
     public void setUdpMulticastPort( int val )
     {
         udpMulticastPort = val;
@@ -157,6 +166,7 @@ public class LateralCacheAttributes
      * Gets the udpMulticastPort attribute of the LateralCacheAttributes object
      * @return The udpMulticastPort value
      */
+    @Override
     public int getUdpMulticastPort()
     {
         return udpMulticastPort;
@@ -166,6 +176,7 @@ public class LateralCacheAttributes
      * Sets the transmissionType attribute of the LateralCacheAttributes object
      * @param val The new transmissionType value
      */
+    @Override
     public void setTransmissionType( Type val )
     {
         this.transmissionType = val;
@@ -176,6 +187,7 @@ public class LateralCacheAttributes
      * Gets the transmissionType attribute of the LateralCacheAttributes object
      * @return The transmissionType value
      */
+    @Override
     public Type getTransmissionType()
     {
         return this.transmissionType;
@@ -185,6 +197,7 @@ public class LateralCacheAttributes
      * Sets the transmissionTypeName attribute of the LateralCacheAttributes object
      * @param val The new transmissionTypeName value
      */
+    @Override
     public void setTransmissionTypeName( String val )
     {
         this.transmissionTypeName = val;
@@ -195,6 +208,7 @@ public class LateralCacheAttributes
      * Gets the transmissionTypeName attribute of the LateralCacheAttributes object
      * @return The transmissionTypeName value
      */
+    @Override
     public String getTransmissionTypeName()
     {
         return this.transmissionTypeName;
@@ -206,6 +220,7 @@ public class LateralCacheAttributes
      * other lateral caches.
      * @param val The new transmissionTypeName value
      */
+    @Override
     public void setPutOnlyMode( boolean val )
     {
         this.putOnlyMode = val;
@@ -214,6 +229,7 @@ public class LateralCacheAttributes
     /**
      * @return The outgoingOnlyMode value. Stops gets from going remote.
      */
+    @Override
     public boolean getPutOnlyMode()
     {
         return putOnlyMode;
@@ -223,6 +239,7 @@ public class LateralCacheAttributes
      * Returns a clone of the attributes.
      * @return Self
      */
+    @Override
     public AuxiliaryCacheAttributes copy()
     {
         try
@@ -239,6 +256,7 @@ public class LateralCacheAttributes
     /**
      * @param receive The receive to set.
      */
+    @Override
     public void setReceive( boolean receive )
     {
         this.receive = receive;
@@ -247,6 +265,7 @@ public class LateralCacheAttributes
     /**
      * @return Returns the receive.
      */
+    @Override
     public boolean isReceive()
     {
         return receive;
@@ -258,6 +277,7 @@ public class LateralCacheAttributes
      * <p>
      * @param zombieQueueMaxSize The zombieQueueMaxSize to set.
      */
+    @Override
     public void setZombieQueueMaxSize( int zombieQueueMaxSize )
     {
         this.zombieQueueMaxSize = zombieQueueMaxSize;
@@ -269,6 +289,7 @@ public class LateralCacheAttributes
      * <p>
      * @return Returns the zombieQueueMaxSize.
      */
+    @Override
     public int getZombieQueueMaxSize()
     {
         return zombieQueueMaxSize;

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java Thu Apr  3 00:04:02 2014
@@ -121,6 +121,7 @@ public class LateralCacheMonitor
     /**
      * Main processing method for the LateralCacheMonitor object
      */
+    @Override
     public void run()
     {
         do

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java Thu Apr  3 00:04:02 2014
@@ -110,6 +110,7 @@ public class LateralCacheNoWait<K extend
      * @param ce
      * @throws IOException
      */
+    @Override
     public void update( ICacheElement<K, V> ce )
         throws IOException
     {
@@ -131,6 +132,7 @@ public class LateralCacheNoWait<K extend
      * @param key
      * @return ICacheElement<K, V> if found, else null
      */
+    @Override
     public ICacheElement<K, V> get( K key )
     {
         getCount++;
@@ -168,6 +170,7 @@ public class LateralCacheNoWait<K extend
      * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
      *         data in cache for any of these keys
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys)
     {
         Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K, V>>();
@@ -194,6 +197,7 @@ public class LateralCacheNoWait<K extend
      * @param pattern
      * @return ICacheElement<K, V> if found, else empty
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getMatching(String pattern)
     {
         getCount++;
@@ -229,6 +233,7 @@ public class LateralCacheNoWait<K extend
      * <p>
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getKeySet()
      */
+    @Override
     public Set<K> getKeySet() throws IOException
     {
         try
@@ -249,6 +254,7 @@ public class LateralCacheNoWait<K extend
      * @param key
      * @return always false
      */
+    @Override
     public boolean remove( K key )
     {
         removeCount++;
@@ -265,6 +271,7 @@ public class LateralCacheNoWait<K extend
     }
 
     /** Adds a removeAll request to the lateral cache. */
+    @Override
     public void removeAll()
     {
         try
@@ -279,6 +286,7 @@ public class LateralCacheNoWait<K extend
     }
 
     /** Adds a dispose request to the lateral cache. */
+    @Override
     public void dispose()
     {
         try
@@ -297,6 +305,7 @@ public class LateralCacheNoWait<K extend
      * <p>
      * @return The size value
      */
+    @Override
     public int getSize()
     {
         return cache.getSize();
@@ -307,6 +316,7 @@ public class LateralCacheNoWait<K extend
      * <p>
      * @return The cacheType value
      */
+    @Override
     public CacheType getCacheType()
     {
         return cache.getCacheType();
@@ -318,6 +328,7 @@ public class LateralCacheNoWait<K extend
      * <p>
      * @return The status value
      */
+    @Override
     public CacheStatus getStatus()
     {
         return eventQueue.isWorking() ? cache.getStatus() : CacheStatus.ERROR;
@@ -328,6 +339,7 @@ public class LateralCacheNoWait<K extend
      * <p>
      * @return The cacheName value
      */
+    @Override
     public String getCacheName()
     {
         return cache.getCacheName();
@@ -363,6 +375,7 @@ public class LateralCacheNoWait<K extend
     /**
      * @return Returns the AuxiliaryCacheAttributes.
      */
+    @Override
     public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
     {
         return cache.getAuxiliaryCacheAttributes();
@@ -372,6 +385,7 @@ public class LateralCacheNoWait<K extend
      * getStats
      * @return String
      */
+    @Override
     public String getStats()
     {
         return getStatistics().toString();
@@ -391,6 +405,7 @@ public class LateralCacheNoWait<K extend
     /**
      * @return statistics about this communication
      */
+    @Override
     public IStats getStatistics()
     {
         IStats stats = new Stats();

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java Thu Apr  3 00:04:02 2014
@@ -191,6 +191,7 @@ public class LateralCacheNoWaitFacade<K 
      * @param ce
      * @throws IOException
      */
+    @Override
     public void update( ICacheElement<K, V> ce )
         throws IOException
     {
@@ -217,6 +218,7 @@ public class LateralCacheNoWaitFacade<K 
      * @param key
      * @return ICacheElement
      */
+    @Override
     public ICacheElement<K, V> get( K key )
     {
         for ( int i = 0; i < noWaits.length; i++ )
@@ -248,6 +250,7 @@ public class LateralCacheNoWaitFacade<K 
      * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
      *         data in cache for any of these keys
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys)
     {
         Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K, V>>();
@@ -275,6 +278,7 @@ public class LateralCacheNoWaitFacade<K 
      * @param pattern
      * @return ICacheElement
      */
+    @Override
     public Map<K, ICacheElement<K, V>> getMatching(String pattern)
     {
         Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K, V>>();
@@ -297,6 +301,7 @@ public class LateralCacheNoWaitFacade<K 
      * <p>
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getKeySet()
      */
+    @Override
     public Set<K> getKeySet() throws IOException
     {
         HashSet<K> allKeys = new HashSet<K>();
@@ -321,6 +326,7 @@ public class LateralCacheNoWaitFacade<K 
      * @param key
      * @return always false.
      */
+    @Override
     public boolean remove( K key )
     {
         try
@@ -340,6 +346,7 @@ public class LateralCacheNoWaitFacade<K 
     /**
      * Adds a removeAll request to the lateral cache.
      */
+    @Override
     public void removeAll()
     {
         try
@@ -356,6 +363,7 @@ public class LateralCacheNoWaitFacade<K 
     }
 
     /** Adds a dispose request to the lateral cache. */
+    @Override
     public void dispose()
     {
         try
@@ -385,6 +393,7 @@ public class LateralCacheNoWaitFacade<K 
      * No lateral invocation.
      * @return The size value
      */
+    @Override
     public int getSize()
     {
         return 0;
@@ -396,6 +405,7 @@ public class LateralCacheNoWaitFacade<K 
      * <p>
      * @return The cacheType value
      */
+    @Override
     public CacheType getCacheType()
     {
         return CacheType.LATERAL_CACHE;
@@ -406,6 +416,7 @@ public class LateralCacheNoWaitFacade<K 
      * <p>
      * @return The cacheName value
      */
+    @Override
     public String getCacheName()
     {
         return "";
@@ -416,6 +427,7 @@ public class LateralCacheNoWaitFacade<K 
      * Gets the status attribute of the LateralCacheNoWaitFacade object
      * @return The status value
      */
+    @Override
     public CacheStatus getStatus()
     {
         if (disposed)
@@ -458,6 +470,7 @@ public class LateralCacheNoWaitFacade<K 
     /**
      * @return Returns the AuxiliaryCacheAttributes.
      */
+    @Override
     public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
     {
         return this.lateralCacheAttributes;
@@ -487,6 +500,7 @@ public class LateralCacheNoWaitFacade<K 
      * getStats
      * @return String
      */
+    @Override
     public String getStats()
     {
         return getStatistics().toString();
@@ -495,6 +509,7 @@ public class LateralCacheNoWaitFacade<K 
     /**
      * @return IStats
      */
+    @Override
     public IStats getStatistics()
     {
         IStats stats = new Stats();

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheRestore.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheRestore.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheRestore.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheRestore.java Thu Apr  3 00:04:02 2014
@@ -62,6 +62,7 @@ public class LateralCacheRestore
      * <p>
      * @return whether or not the cache can be fixed.
      */
+    @Override
     public boolean canFix()
     {
         if ( !canFix )
@@ -85,6 +86,7 @@ public class LateralCacheRestore
     /**
      * Fixes up all the caches managed by the associated cache manager.
      */
+    @Override
     @SuppressWarnings("unchecked") // TODO: Strange cast. Need to revisit
     public void fix()
     {

Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java?rev=1584220&r1=1584219&r2=1584220&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java Thu Apr  3 00:04:02 2014
@@ -304,6 +304,7 @@ public class LateralTCPCacheManager
     /**
      * @return Map
      */
+    @Override
     public Map<String, ? extends ILateralCacheManager> getInstances()
     {
         return instances;
@@ -313,6 +314,7 @@ public class LateralTCPCacheManager
      * @return a new service
      * @throws IOException
      */
+    @Override
     public Object fixService()
         throws IOException
     {
@@ -333,6 +335,7 @@ public class LateralTCPCacheManager
      * Shuts down the lateral sender. This does not shutdown the listener. This can be called if the
      * end point is taken out of service.
      */
+    @Override
     public void shutdown()
     {
         // TODO revisit this.



Mime
View raw message