commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1222396 [1/2] - in /commons/proper/pool/branches/POOL_1_X/src: java/org/apache/commons/pool/ java/org/apache/commons/pool/impl/ test/org/apache/commons/pool/ test/org/apache/commons/pool/impl/
Date Thu, 22 Dec 2011 19:02:26 GMT
Author: ggregory
Date: Thu Dec 22 19:02:25 2011
New Revision: 1222396

URL: http://svn.apache.org/viewvc?rev=1222396&view=rev
Log:
Add @Override and @Deprecated.

Modified:
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/KeyedObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/ObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/PoolUtils.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPoolFactory.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPoolFactory.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPoolFactory.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestKeyedObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestPoolUtils.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/VisitTracker.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackObjectPool.java
    commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackObjectPoolFactory.java

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java Thu Dec 22 19:02:25 2011
@@ -135,6 +135,7 @@ public abstract class BaseKeyedObjectPoo
      * @param factory the new KeyedPoolableObjectFactory
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
     public void setFactory(KeyedPoolableObjectFactory<K, V> factory) throws IllegalStateException, UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/BaseObjectPool.java Thu Dec 22 19:02:25 2011
@@ -117,6 +117,7 @@ public abstract class BaseObjectPool<T> 
      * @throws IllegalStateException
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
     public void setFactory(PoolableObjectFactory<T> factory) throws IllegalStateException, UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/KeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/KeyedObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/KeyedObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/KeyedObjectPool.java Thu Dec 22 19:02:25 2011
@@ -228,5 +228,6 @@ public interface KeyedObjectPool<K, V> {
      * @throws UnsupportedOperationException when this implementation doesn't support the operation
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
     void setFactory(KeyedPoolableObjectFactory<K, V> factory) throws IllegalStateException, UnsupportedOperationException;
 }

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/ObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/ObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/ObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/ObjectPool.java Thu Dec 22 19:02:25 2011
@@ -188,5 +188,6 @@ public interface ObjectPool<T> {
      * @throws UnsupportedOperationException if this implementation does not support the operation
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
     void setFactory(PoolableObjectFactory<T> factory) throws IllegalStateException, UnsupportedOperationException;
 }

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/PoolUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/PoolUtils.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/PoolUtils.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/PoolUtils.java Thu Dec 22 19:02:25 2011
@@ -686,6 +686,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("PoolableObjectFactoryAdaptor");
@@ -773,6 +774,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("KeyedPoolableObjectFactoryAdaptor");
@@ -886,6 +888,7 @@ public final class PoolUtils {
          * @param factory new PoolableObjectFactory 
          * @deprecated to be removed in version 2.0
          */
+        @Deprecated
         public void setFactory(final PoolableObjectFactory<V> factory) throws IllegalStateException, UnsupportedOperationException {
             keyedPool.setFactory(adapt(factory));
         }
@@ -893,6 +896,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("ObjectPoolAdaptor");
@@ -1038,6 +1042,7 @@ public final class PoolUtils {
          * @param factory new factory to use managing object instances
          * @deprecated to be removed in version 2.0
          */
+        @Deprecated
         @SuppressWarnings("unchecked")
         public void setFactory(final KeyedPoolableObjectFactory<K, V> factory) throws IllegalStateException, UnsupportedOperationException {
             pool.setFactory(adapt((KeyedPoolableObjectFactory<Object, V>)factory));
@@ -1046,6 +1051,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("KeyedObjectPoolAdaptor");
@@ -1185,6 +1191,7 @@ public final class PoolUtils {
          * @param factory object factory
          * @deprecated to be removed in version 2.0
          */
+        @Deprecated
         public void setFactory(final PoolableObjectFactory<T> factory) throws IllegalStateException, UnsupportedOperationException {
             pool.setFactory(factory);
         }
@@ -1192,6 +1199,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("CheckedObjectPool");
@@ -1355,6 +1363,7 @@ public final class PoolUtils {
          * @param factory object factory
          * @deprecated to be removed in version 2.0
          */
+        @Deprecated
         public void setFactory(final KeyedPoolableObjectFactory<K, V> factory) throws IllegalStateException, UnsupportedOperationException {
             keyedPool.setFactory(factory);
         }
@@ -1362,6 +1371,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("CheckedKeyedObjectPool");
@@ -1404,6 +1414,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void run() {
             boolean success = false;
             try {
@@ -1426,6 +1437,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("ObjectPoolMinIdleTimerTask");
@@ -1472,6 +1484,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void run() {
             boolean success = false;
             try {
@@ -1494,6 +1507,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("KeyedObjectPoolMinIdleTimerTask");
@@ -1627,6 +1641,7 @@ public final class PoolUtils {
          * @param factory new PoolableObjectFactory
          * @deprecated to be removed in pool 2.0
          */
+        @Deprecated
         public void setFactory(final PoolableObjectFactory<T> factory) throws IllegalStateException, UnsupportedOperationException {
             synchronized (lock) {
                 pool.setFactory(factory);
@@ -1636,6 +1651,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("SynchronizedObjectPool");
@@ -1794,6 +1810,7 @@ public final class PoolUtils {
          * @param factory KeyedPoolableObjectFactory used by the pool
          * @deprecated to be removed in pool 2.0
          */
+        @Deprecated
         public void setFactory(final KeyedPoolableObjectFactory<K, V> factory) throws IllegalStateException, UnsupportedOperationException {
             synchronized (lock) {
                 keyedPool.setFactory(factory);
@@ -1803,6 +1820,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("SynchronizedKeyedObjectPool");
@@ -1889,6 +1907,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("SynchronizedPoolableObjectFactory");
@@ -1975,6 +1994,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             final StringBuffer sb = new StringBuffer();
             sb.append("SynchronizedKeyedPoolableObjectFactory");
@@ -2049,6 +2069,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             return "ErodingFactor{" +
                     "factor=" + factor +
@@ -2176,6 +2197,7 @@ public final class PoolUtils {
          * {@inheritDoc}
          * @deprecated to be removed in pool 2.0
          */
+        @Deprecated
         public void setFactory(final PoolableObjectFactory<T> factory) throws IllegalStateException, UnsupportedOperationException {
             pool.setFactory(factory);
         }
@@ -2183,6 +2205,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             return "ErodingObjectPool{" +
                     "factor=" + factor +
@@ -2360,6 +2383,7 @@ public final class PoolUtils {
          * {@inheritDoc}
          * @deprecated to be removed in pool 2.0
          */
+        @Deprecated
         public void setFactory(final KeyedPoolableObjectFactory<K, V> factory) throws IllegalStateException, UnsupportedOperationException {
             keyedPool.setFactory(factory);
         }
@@ -2376,6 +2400,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             return "ErodingKeyedObjectPool{" +
                     "erodingFactor=" + erodingFactor +
@@ -2409,6 +2434,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         protected int numIdle(final K key) {
             return getKeyedPool().getNumIdle(key);
         }
@@ -2416,6 +2442,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         protected ErodingFactor getErodingFactor(final K key) {
             ErodingFactor factor = factors.get(key);
             // this may result in two ErodingFactors being created for a key
@@ -2430,6 +2457,7 @@ public final class PoolUtils {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString() {
             return "ErodingPerKeyKeyedObjectPool{" +
                     "factor=" + factor +

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java Thu Dec 22 19:02:25 2011
@@ -319,6 +319,7 @@ class CursorableLinkedList<E> implements
      * @param o the object to be compared for equality with this list.
      * @return <tt>true</tt> if the specified object is equal to this list.
      */
+    @Override
     public boolean equals(Object o) {
         if(o == this) {
             return true;
@@ -390,6 +391,7 @@ class CursorableLinkedList<E> implements
      * @see Object#equals(Object)
      * @see #equals(Object)
      */
+    @Override
     public int hashCode() {
         int hash = 1;
         for(Listable<E> elt = _head.next(), past = null; null != elt && past != _head.prev(); elt = (past = elt).next()) {
@@ -696,6 +698,7 @@ class CursorableLinkedList<E> implements
      * Returns a {@link String} representation of this list, suitable for debugging.
      * @return a {@link String} representation of this list, suitable for debugging.
      */
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer();
         buf.append("[");
@@ -1123,14 +1126,17 @@ class CursorableLinkedList<E> implements
             registerCursor(this);
         }
 
+        @Override
         public int previousIndex() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public int nextIndex() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void add(E o) {
             checkForComod();
             Listable<E> elt = insertListable(_cur.prev(),_cur.next(),o);
@@ -1177,6 +1183,7 @@ class CursorableLinkedList<E> implements
             }
         }
 
+        @Override
         protected void checkForComod() {
             if(!_valid) {
                 throw new ConcurrentModificationException();
@@ -1240,6 +1247,7 @@ class CursorableSubList<E> extends Curso
 
     //--- public methods ------------------------------------------
 
+    @Override
     public void clear() {
         checkForComod();
         Iterator<E> it = iterator();
@@ -1249,151 +1257,181 @@ class CursorableSubList<E> extends Curso
         }
     }
 
+    @Override
     public Iterator<E> iterator() {
         checkForComod();
         return super.iterator();
     }
 
+    @Override
     public int size() {
         checkForComod();
         return super.size();
     }
 
+    @Override
     public boolean isEmpty() {
         checkForComod();
         return super.isEmpty();
     }
 
+    @Override
     public Object[] toArray() {
         checkForComod();
         return super.toArray();
     }
 
+    @Override
     public <T> T[] toArray(T a[]) {
         checkForComod();
         return super.toArray(a);
     }
 
+    @Override
     public boolean contains(Object o) {
         checkForComod();
         return super.contains(o);
     }
 
+    @Override
     public boolean remove(Object o) {
         checkForComod();
         return super.remove(o);
     }
 
+    @Override
     public E removeFirst() {
         checkForComod();
         return super.removeFirst();
     }
 
+    @Override
     public E removeLast() {
         checkForComod();
         return super.removeLast();
     }
 
+    @Override
     public boolean addAll(Collection<? extends E> c) {
         checkForComod();
         return super.addAll(c);
     }
 
+    @Override
     public boolean add(E o) {
         checkForComod();
         return super.add(o);
     }
 
+    @Override
     public boolean addFirst(E o) {
         checkForComod();
         return super.addFirst(o);
     }
 
+    @Override
     public boolean addLast(E o) {
         checkForComod();
         return super.addLast(o);
     }
 
+    @Override
     public boolean removeAll(Collection<?> c) {
         checkForComod();
         return super.removeAll(c);
     }
 
+    @Override
     public boolean containsAll(Collection<?> c) {
         checkForComod();
         return super.containsAll(c);
     }
 
+    @Override
     public boolean addAll(int index, Collection<? extends E> c) {
         checkForComod();
         return super.addAll(index,c);
     }
 
+    @Override
     public int hashCode() {
         checkForComod();
         return super.hashCode();
     }
 
+    @Override
     public boolean retainAll(Collection<?> c) {
         checkForComod();
         return super.retainAll(c);
     }
 
+    @Override
     public E set(int index, E element) {
         checkForComod();
         return super.set(index,element);
     }
 
+    @Override
     public boolean equals(Object o) {
         checkForComod();
         return super.equals(o);
     }
 
+    @Override
     public E get(int index) {
         checkForComod();
         return super.get(index);
     }
 
+    @Override
     public E getFirst() {
         checkForComod();
         return super.getFirst();
     }
 
+    @Override
     public E getLast() {
         checkForComod();
         return super.getLast();
     }
 
+    @Override
     public void add(int index, E element) {
         checkForComod();
         super.add(index,element);
     }
 
+    @Override
     public ListIterator<E> listIterator(int index) {
         checkForComod();
         return super.listIterator(index);
     }
 
+    @Override
     public E remove(int index) {
         checkForComod();
         return super.remove(index);
     }
 
+    @Override
     public int indexOf(Object o) {
         checkForComod();
         return super.indexOf(o);
     }
 
+    @Override
     public int lastIndexOf(Object o) {
         checkForComod();
         return super.lastIndexOf(o);
     }
 
+    @Override
     public ListIterator<E> listIterator() {
         checkForComod();
         return super.listIterator();
     }
 
+    @Override
     public List<E> subList(int fromIndex, int toIndex) {
         checkForComod();
         return super.subList(fromIndex,toIndex);
@@ -1408,6 +1446,7 @@ class CursorableSubList<E> extends Curso
      *
      * @return the newly created {@link CursorableLinkedList.Listable}
      */
+    @Override
     protected Listable<E> insertListable(Listable<E> before, Listable<E> after, E value) {
         _modCount++;
         _size++;
@@ -1429,6 +1468,7 @@ class CursorableSubList<E> extends Curso
     /**
      * Removes the given {@link CursorableLinkedList.Listable} from my list.
      */
+    @Override
     protected void removeListable(Listable<E> elt) {
         _modCount++;
         _size--;

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java Thu Dec 22 19:02:25 2011
@@ -1088,7 +1088,8 @@ public class GenericKeyedObjectPool<K, V
      * @return object instance from the keyed pool
      * @throws NoSuchElementException if a keyed object instance cannot be returned.
      */
-     public V borrowObject(K key) throws Exception {
+     @Override
+    public V borrowObject(K key) throws Exception {
         long starttime = System.currentTimeMillis();
         Latch<K, V> latch = new Latch<K, V>(key);
         byte whenExhaustedAction;
@@ -1367,6 +1368,7 @@ public class GenericKeyedObjectPool<K, V
      * while removed items are being destroyed.</li>
      * <li>Exceptions encountered destroying idle instances are swallowed.</li></ul></p>
      */
+    @Override
     public void clear() {
         Map<K,  List<ObjectTimestampPair<V>>> toDestroy = new HashMap<K,  List<ObjectTimestampPair<V>>>();
         synchronized (this) {
@@ -1450,6 +1452,7 @@ public class GenericKeyedObjectPool<K, V
      *
      * @param key the key to clear
      */
+    @Override
     public void clear(K key) {
         Map<K, List<ObjectTimestampPair<V>>> toDestroy = new HashMap<K , List<ObjectTimestampPair<V>>>();
 
@@ -1520,6 +1523,7 @@ public class GenericKeyedObjectPool<K, V
      *
      * @return the total number of instances currently borrowed from this pool
      */
+    @Override
     public synchronized int getNumActive() {
         return _totalActive;
     }
@@ -1529,6 +1533,7 @@ public class GenericKeyedObjectPool<K, V
      *
      * @return the total number of instances currently idle in this pool
      */
+    @Override
     public synchronized int getNumIdle() {
         return _totalIdle;
     }
@@ -1540,6 +1545,7 @@ public class GenericKeyedObjectPool<K, V
      * @param key the key to query
      * @return the number of instances corresponding to the given <code>key</code> currently borrowed in this pool
      */
+    @Override
     public synchronized int getNumActive(Object key) {
         final ObjectQueue pool = (_poolMap.get(key));
         return pool != null ? pool.activeCount : 0;
@@ -1551,6 +1557,7 @@ public class GenericKeyedObjectPool<K, V
      * @param key the key to query
      * @return the number of instances corresponding to the given <code>key</code> currently idle in this pool
      */
+    @Override
     public synchronized int getNumIdle(Object key) {
         final ObjectQueue pool = (_poolMap.get(key));
         return pool != null ? pool.queue.size() : 0;
@@ -1574,6 +1581,7 @@ public class GenericKeyedObjectPool<K, V
      * @param obj instance to return to the keyed pool
      * @throws Exception
      */
+    @Override
     public void returnObject(K key, V obj) throws Exception {
         try {
             addObjectToPool(key, obj, true);
@@ -1703,6 +1711,7 @@ public class GenericKeyedObjectPool<K, V
      * @param obj instance to invalidate
      * @throws Exception if an exception occurs destroying the object
      */
+    @Override
     public void invalidateObject(K key, V obj) throws Exception {
         try {
             _factory.destroyObject(key, obj);
@@ -1730,6 +1739,7 @@ public class GenericKeyedObjectPool<K, V
      * @throws IllegalStateException when no {@link #setFactory factory} has been set or after {@link #close} has been
      * called on this pool.
      */
+    @Override
     public void addObject(K key) throws Exception {
         assertOpen();
         if (_factory == null) {
@@ -1790,6 +1800,7 @@ public class GenericKeyedObjectPool<K, V
      * 
      * @throws Exception
      */
+    @Override
     public void close() throws Exception {
         super.close();
         synchronized (this) {
@@ -1826,6 +1837,8 @@ public class GenericKeyedObjectPool<K, V
      * @throws IllegalStateException if there are active (checked out) instances associated with this keyed object pool
      * @deprecated to be removed in version 2.0
      */
+    @Deprecated
+    @Override
     public void setFactory(KeyedPoolableObjectFactory<K, V> factory) throws IllegalStateException {
         Map<K, List<ObjectTimestampPair<V>>> toDestroy = new HashMap<K, List<ObjectTimestampPair<V>>>();
         final KeyedPoolableObjectFactory<K, V> oldFactory = _factory;
@@ -2273,12 +2286,14 @@ public class GenericKeyedObjectPool<K, V
          * Object instance 
          * @deprecated this field will be made private and final in version 2.0
          */
+        @Deprecated
         T value;
         
         /**
          * timestamp
          * @deprecated this field will be made private and final in version 2.0
          */
+        @Deprecated
         long tstamp;
         //CHECKSTYLE: resume VisibilityModifier
 
@@ -2305,6 +2320,7 @@ public class GenericKeyedObjectPool<K, V
          * 
          * @return String representing this ObjectTimestampPair
          */
+        @Override
         public String toString() {
             return value + ";" + tstamp;
         }
@@ -2364,6 +2380,7 @@ public class GenericKeyedObjectPool<K, V
          * Run pool maintenance.  Evict objects qualifying for eviction and then
          * invoke {@link GenericKeyedObjectPool#ensureMinIdle()}.
          */
+        @Override
         public void run() {
             //Evict from the pool
             try {

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java Thu Dec 22 19:02:25 2011
@@ -373,54 +373,63 @@ public class GenericKeyedObjectPoolFacto
      * The {@link GenericKeyedObjectPool#getMaxIdle() maxIdle} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getMaxIdle()}.
      */
+    @Deprecated
     protected int _maxIdle = GenericKeyedObjectPool.DEFAULT_MAX_IDLE;
     
     /**
      * The {@link GenericKeyedObjectPool#getMaxActive() maxActive} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getMaxActive()}.
      */
+    @Deprecated
     protected int _maxActive = GenericKeyedObjectPool.DEFAULT_MAX_ACTIVE;
     
     /**
      * The {@link GenericKeyedObjectPool#getMaxTotal() maxTotal} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getMaxTotal()}.
      */
+    @Deprecated
     protected int _maxTotal = GenericKeyedObjectPool.DEFAULT_MAX_TOTAL;
     
     /**
      * The {@link GenericKeyedObjectPool#getMinIdle() minIdle} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getMinIdle()}.
      */
+    @Deprecated
     protected int _minIdle = GenericKeyedObjectPool.DEFAULT_MIN_IDLE;
     
     /**
      * The {@link GenericKeyedObjectPool#getMaxWait() maxWait} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getMaxWait()}.
      */
+    @Deprecated
     protected long _maxWait = GenericKeyedObjectPool.DEFAULT_MAX_WAIT;
     
     /**
      * The {@link GenericKeyedObjectPool#getWhenExhaustedAction() whenExhaustedAction} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getWhenExhaustedAction()}.
      */
+    @Deprecated
     protected byte _whenExhaustedAction = GenericKeyedObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION;
     
     /**
      * The {@link GenericKeyedObjectPool#getTestOnBorrow() testOnBorrow} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getTestOnBorrow()}.
      */
+    @Deprecated
     protected boolean _testOnBorrow = GenericKeyedObjectPool.DEFAULT_TEST_ON_BORROW;
     
     /**
      * The {@link GenericKeyedObjectPool#getTestOnReturn() testOnReturn} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getTestOnReturn()}.
      */
+    @Deprecated
     protected boolean _testOnReturn = GenericKeyedObjectPool.DEFAULT_TEST_ON_RETURN;
     
     /**
      * The {@link GenericKeyedObjectPool#getTestWhileIdle() testWhileIdle} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getTestWhileIdle()}.
      */
+    @Deprecated
     protected boolean _testWhileIdle = GenericKeyedObjectPool.DEFAULT_TEST_WHILE_IDLE;
     
     /**
@@ -428,6 +437,7 @@ public class GenericKeyedObjectPoolFacto
      * pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getTimeBetweenEvictionRunsMillis()}.
      */
+    @Deprecated
     protected long _timeBetweenEvictionRunsMillis = GenericKeyedObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
     
     /**
@@ -435,6 +445,7 @@ public class GenericKeyedObjectPoolFacto
      * pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getNumTestsPerEvictionRun()}.
      */
+    @Deprecated
     protected int _numTestsPerEvictionRun =  GenericKeyedObjectPool.DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
     
     /**
@@ -442,18 +453,21 @@ public class GenericKeyedObjectPoolFacto
      * pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getMinEvictableIdleTimeMillis()}.
      */
+    @Deprecated
     protected long _minEvictableIdleTimeMillis = GenericKeyedObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
     
     /**
      * The {@link KeyedPoolableObjectFactory} used by pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getFactory()}.
      */
+    @Deprecated
     protected KeyedPoolableObjectFactory<K, V> _factory = null;
     
     /**
      * The {@link GenericKeyedObjectPool#getLifo() lifo} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0. Use {@link #getLifo()}.
      */
+    @Deprecated
     protected boolean _lifo = GenericKeyedObjectPool.DEFAULT_LIFO;
 
 }

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java Thu Dec 22 19:02:25 2011
@@ -1054,6 +1054,7 @@ public class GenericObjectPool<T> extend
      * @return object instance
      * @throws NoSuchElementException if an instance cannot be returned
      */
+    @Override
     public T borrowObject() throws Exception {
         long starttime = System.currentTimeMillis();
         Latch<T> latch = new Latch<T>();
@@ -1282,6 +1283,7 @@ public class GenericObjectPool<T> extend
      * 
      * @throws Exception if the configured {@link PoolableObjectFactory} throws an exception destroying obj
      */
+    @Override
     public void invalidateObject(T obj) throws Exception {
         try {
             if (_factory != null) {
@@ -1310,6 +1312,7 @@ public class GenericObjectPool<T> extend
      * while removed items are being destroyed.</li>
      * <li>Exceptions encountered destroying idle instances are swallowed.</li></ul></p>
      */
+    @Override
     public void clear() {
         List<ObjectTimestampPair<T>> toDestroy = new ArrayList<ObjectTimestampPair<T>>();
 
@@ -1350,6 +1353,7 @@ public class GenericObjectPool<T> extend
      *
      * @return the number of instances currently borrowed from this pool
      */
+    @Override
     public synchronized int getNumActive() {
         return _numActive;
     }
@@ -1359,6 +1363,7 @@ public class GenericObjectPool<T> extend
      *
      * @return the number of instances currently idle in this pool
      */
+    @Override
     public synchronized int getNumIdle() {
         return _pool.size();
     }
@@ -1382,6 +1387,7 @@ public class GenericObjectPool<T> extend
      * 
      * @param obj instance to return to the pool
      */
+    @Override
     public void returnObject(T obj) throws Exception {
         try {
             addObjectToPool(obj, true);
@@ -1482,6 +1488,7 @@ public class GenericObjectPool<T> extend
      * 
      * @throws Exception
      */
+    @Override
     public void close() throws Exception {
         super.close();
         synchronized (this) {
@@ -1511,6 +1518,8 @@ public class GenericObjectPool<T> extend
      * @throws IllegalStateException when the factory cannot be set at this time
      * @deprecated to be removed in version 2.0
      */
+    @Deprecated
+    @Override
     public void setFactory(PoolableObjectFactory<T> factory) throws IllegalStateException {
         List<ObjectTimestampPair<T>> toDestroy = new ArrayList<ObjectTimestampPair<T>>();
         final PoolableObjectFactory<T> oldFactory = _factory;
@@ -1673,6 +1682,7 @@ public class GenericObjectPool<T> extend
      * Create an object, and place it into the pool.
      * addObject() is useful for "pre-loading" a pool with idle objects.
      */
+    @Override
     public void addObject() throws Exception {
         assertOpen();
         if (_factory == null) {
@@ -1759,6 +1769,7 @@ public class GenericObjectPool<T> extend
          * Run pool maintenance.  Evict objects qualifying for eviction and then
          * invoke {@link GenericObjectPool#ensureMinIdle()}.
          */
+        @Override
         public void run() {
             try {
                 evict();

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPoolFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPoolFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPoolFactory.java Thu Dec 22 19:02:25 2011
@@ -357,24 +357,28 @@ public class GenericObjectPoolFactory<T>
      * The {@link GenericObjectPool#getMaxIdle() maxIdle} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getMaxIdle()}.
      */
+    @Deprecated
     protected int _maxIdle = GenericObjectPool.DEFAULT_MAX_IDLE;
     
     /**
      * The {@link GenericObjectPool#getMinIdle() minIdle} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getMinIdle()}.
      */
+    @Deprecated
     protected int _minIdle = GenericObjectPool.DEFAULT_MIN_IDLE;
     
     /**
      * The {@link GenericObjectPool#getMaxActive() maxActive} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getMaxActive()}.
      */
+    @Deprecated
     protected int _maxActive = GenericObjectPool.DEFAULT_MAX_ACTIVE;
     
     /**
      * The {@link GenericObjectPool#getMaxWait() maxWait} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getMaxWait()}.
      */
+    @Deprecated
     protected long _maxWait = GenericObjectPool.DEFAULT_MAX_WAIT;
     
     /**
@@ -382,24 +386,28 @@ public class GenericObjectPoolFactory<T>
      * created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getWhenExhaustedAction()}.
      */
+    @Deprecated
     protected byte _whenExhaustedAction = GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION;
     
     /**
      * The {@link GenericObjectPool#getTestOnBorrow() testOnBorrow} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getTestOnBorrow()}.
      */
+    @Deprecated
     protected boolean _testOnBorrow = GenericObjectPool.DEFAULT_TEST_ON_BORROW;
     
     /**
      * The {@link GenericObjectPool#getTestOnReturn() testOnReturn} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getTestOnReturn()}.
      */
+    @Deprecated
     protected boolean _testOnReturn = GenericObjectPool.DEFAULT_TEST_ON_RETURN;
     
     /**
      * The {@link GenericObjectPool#getTestWhileIdle() testWhileIdle} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getTestWhileIdle()}.
      */
+    @Deprecated
     protected boolean _testWhileIdle = GenericObjectPool.DEFAULT_TEST_WHILE_IDLE;
     
     /**
@@ -407,6 +415,7 @@ public class GenericObjectPoolFactory<T>
      * setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getTimeBetweenEvictionRunsMillis()}.
      */
+    @Deprecated
     protected long _timeBetweenEvictionRunsMillis = GenericObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
     
     /**
@@ -414,6 +423,7 @@ public class GenericObjectPoolFactory<T>
      * for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getNumTestsPerEvictionRun()}.
      */
+    @Deprecated
     protected int _numTestsPerEvictionRun =  GenericObjectPool.DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
     
     /**
@@ -421,6 +431,7 @@ public class GenericObjectPoolFactory<T>
      * setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getMinEvictableIdleTimeMillis()}.
      */
+    @Deprecated
     protected long _minEvictableIdleTimeMillis = GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
     
     /**
@@ -428,18 +439,21 @@ public class GenericObjectPoolFactory<T>
      * setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getSoftMinEvictableIdleTimeMillis()}.
      */
+    @Deprecated
     protected long _softMinEvictableIdleTimeMillis = GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
     
     /**
      * The {@link GenericObjectPool#getLifo() lifo} setting for pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getLifo()}.
      */
+    @Deprecated
     protected boolean _lifo = GenericObjectPool.DEFAULT_LIFO;
     
     /**
      * The {@link PoolableObjectFactory} used by pools created by this factory.
      * @deprecated to be removed in pool 2.0.  Use {@link #getFactory()}.
      */
+    @Deprecated
     protected PoolableObjectFactory<T> _factory = null;
 
 }

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java Thu Dec 22 19:02:25 2011
@@ -51,6 +51,7 @@ public class SoftReferenceObjectPool<T> 
      * @see #SoftReferenceObjectPool(PoolableObjectFactory)
      * @deprecated to be removed in pool 2.0.  Use {@link #SoftReferenceObjectPool(PoolableObjectFactory)}.
      */
+    @Deprecated
     public SoftReferenceObjectPool() {
         _pool = new ArrayList<SoftReference<T>>();
         _factory = null;
@@ -76,6 +77,7 @@ public class SoftReferenceObjectPool<T> 
      * @deprecated because this is a SoftReference pool, prefilled idle obejects may be garbage collected before they are used.
      *      To be removed in Pool 2.0.
      */
+    @Deprecated
     public SoftReferenceObjectPool(PoolableObjectFactory<T> factory, int initSize) throws Exception, IllegalArgumentException {
         if (factory == null) {
             throw new IllegalArgumentException("factory required to prefill the pool.");
@@ -106,6 +108,7 @@ public class SoftReferenceObjectPool<T> 
      * @throws Exception if an exception occurs creating a new instance
      * @return a valid, activated object instance
      */
+    @Override
     public synchronized T borrowObject() throws Exception {
         assertOpen();
         T obj = null;
@@ -165,6 +168,7 @@ public class SoftReferenceObjectPool<T> 
      * 
      * @param obj instance to return to the pool
      */
+    @Override
     public synchronized void returnObject(T obj) throws Exception {
         boolean success = !isClosed();
         if (_factory != null) {
@@ -198,6 +202,7 @@ public class SoftReferenceObjectPool<T> 
     /**
      * {@inheritDoc}
      */
+    @Override
     public synchronized void invalidateObject(T obj) throws Exception {
         _numActive--;
         if (_factory != null) {
@@ -220,6 +225,7 @@ public class SoftReferenceObjectPool<T> 
      * @throws IllegalStateException if invoked on a {@link #close() closed} pool
      * @throws Exception when the {@link #getFactory() factory} has a problem creating or passivating an object.
      */
+    @Override
     public synchronized void addObject() throws Exception {
         assertOpen();
         if (_factory == null) {
@@ -254,6 +260,7 @@ public class SoftReferenceObjectPool<T> 
      * 
      * @return estimated number of idle instances in the pool
      */
+    @Override
     public synchronized int getNumIdle() {
         pruneClearedReferences();
         return _pool.size();
@@ -264,6 +271,7 @@ public class SoftReferenceObjectPool<T> 
      *
      * @return the number of instances currently borrowed from this pool
      */
+    @Override
     public synchronized int getNumActive() {
         return _numActive;
     }
@@ -271,6 +279,7 @@ public class SoftReferenceObjectPool<T> 
     /**
      * Clears any objects sitting idle in the pool.
      */
+    @Override
     public synchronized void clear() {
         if(null != _factory) {
             Iterator<SoftReference<T>> iter = _pool.iterator();
@@ -299,6 +308,7 @@ public class SoftReferenceObjectPool<T> 
      *
      * @throws Exception never - exceptions clearing the pool are swallowed
      */
+    @Override
     public void close() throws Exception {
         super.close();
         clear();
@@ -314,6 +324,8 @@ public class SoftReferenceObjectPool<T> 
      * @throws IllegalStateException when the factory cannot be set at this time
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
+    @Override
     public synchronized void setFactory(PoolableObjectFactory<T> factory) throws IllegalStateException {
         assertOpen();
         if(0 < getNumActive()) {

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java Thu Dec 22 19:02:25 2011
@@ -143,6 +143,7 @@ public class StackKeyedObjectPool<K, V> 
      * @param key the pool key
      * @return keyed poolable object instance
      */
+    @Override
     public synchronized V borrowObject(K key) throws Exception {
         assertOpen();
         Stack<V> stack = (_pools.get(key));
@@ -202,6 +203,7 @@ public class StackKeyedObjectPool<K, V> 
      * @param key the pool key
      * @param obj returning instance
      */
+    @Override
     public synchronized void returnObject(K key, V obj) throws Exception {
         decrementActiveCount(key);
         if (null != _factory) {
@@ -258,6 +260,7 @@ public class StackKeyedObjectPool<K, V> 
     /**
      * {@inheritDoc}
      */
+    @Override
     public synchronized void invalidateObject(K key, V obj) throws Exception {
         decrementActiveCount(key);
         if(null != _factory) {
@@ -275,6 +278,7 @@ public class StackKeyedObjectPool<K, V> 
      * @throws Exception when {@link KeyedPoolableObjectFactory#makeObject} fails.
      * @throws IllegalStateException when no {@link #setFactory factory} has been set or after {@link #close} has been called on this pool.
      */
+    @Override
     public synchronized void addObject(K key) throws Exception {
         assertOpen();
         if (_factory == null) {
@@ -330,6 +334,7 @@ public class StackKeyedObjectPool<K, V> 
      *
      * @return the total number of instances currently idle in this pool
      */
+    @Override
     public synchronized int getNumIdle() {
         return _totIdle;
     }
@@ -339,6 +344,7 @@ public class StackKeyedObjectPool<K, V> 
      *
      * @return the total number of instances currently borrowed from this pool
      */
+    @Override
     public synchronized int getNumActive() {
         return _totActive;
     }
@@ -350,6 +356,7 @@ public class StackKeyedObjectPool<K, V> 
      * @param key the key to query
      * @return the number of instances corresponding to the given <code>key</code> currently borrowed in this pool
      */
+    @Override
     public synchronized int getNumActive(K key) {
         return getActiveCount(key);
     }
@@ -360,6 +367,7 @@ public class StackKeyedObjectPool<K, V> 
      * @param key the key to query
      * @return the number of instances corresponding to the given <code>key</code> currently idle in this pool
      */
+    @Override
     public synchronized int getNumIdle(K key) {
         try {
             return(_pools.get(key)).size();
@@ -371,6 +379,7 @@ public class StackKeyedObjectPool<K, V> 
     /**
      * Clears the pool, removing all pooled instances.
      */
+    @Override
     public synchronized void clear() {
         Iterator<K> it = _pools.keySet().iterator();
         while(it.hasNext()) {
@@ -388,6 +397,7 @@ public class StackKeyedObjectPool<K, V> 
      *
      * @param key the key to clear
      */
+    @Override
     public synchronized void clear(K key) {
         Stack<V> stack = _pools.remove(key);
         destroyStack(key,stack);
@@ -425,6 +435,7 @@ public class StackKeyedObjectPool<K, V> 
      * 
      * @return Keys and pool sizes
      */
+    @Override
     public synchronized String toString() {
         StringBuffer buf = new StringBuffer();
         buf.append(getClass().getName());
@@ -448,6 +459,7 @@ public class StackKeyedObjectPool<K, V> 
      *
      * @throws Exception <strong>deprecated</strong>: implementations should silently fail if not all resources can be freed.
      */
+    @Override
     public void close() throws Exception {
         super.close();
         clear();
@@ -463,6 +475,8 @@ public class StackKeyedObjectPool<K, V> 
      * @throws IllegalStateException when the factory cannot be set at this time
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
+    @Override
     public synchronized void setFactory(KeyedPoolableObjectFactory<K, V> factory) throws IllegalStateException {
         if(0 < getNumActive()) {
             throw new IllegalStateException("Objects are already active");
@@ -592,42 +606,49 @@ public class StackKeyedObjectPool<K, V> 
      *  My named-set of pools.
      *  @deprecated to be removed in pool 2.0.  Use {@link #getPools()}
      */
+    @Deprecated
     protected HashMap<K, Stack<V>> _pools = null;
 
     /**
      * My {@link KeyedPoolableObjectFactory}.
      * @deprecated to be removed in pool 2.0.  Use {@link #getFactory()}
      */
+    @Deprecated
     protected KeyedPoolableObjectFactory<K, V> _factory = null;
 
     /**
      *  The cap on the number of "sleeping" instances in <code>each</code> pool.
      *  @deprecated to be removed in pool 2.0.  Use {@link #getMaxSleeping()}
      */
+    @Deprecated
     protected int _maxSleeping = DEFAULT_MAX_SLEEPING;
 
     /**
      * The initial capacity of each pool.
      * @deprecated to be removed in pool 2.0.  Use {@link #getInitSleepingCapacity()}.
      */
+    @Deprecated
     protected int _initSleepingCapacity = DEFAULT_INIT_SLEEPING_CAPACITY;
 
     /**
      * Total number of object borrowed and not yet returned for all pools.
      * @deprecated to be removed in pool 2.0.  Use {@link #getTotActive()}.
      */
+    @Deprecated
     protected int _totActive = 0;
 
     /**
      * Total number of objects "sleeping" for all pools
      * @deprecated to be removed in pool 2.0.  Use {@link #getTotIdle()}.
      */
+    @Deprecated
     protected int _totIdle = 0;
 
     /**
      * Number of active objects borrowed and not yet returned by pool
      * @deprecated to be removed in pool 2.0.  Use {@link #getActiveCount()}.
      */
+    @Deprecated
     protected HashMap<K, Integer> _activeCount = null;
 
 }

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPoolFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPoolFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackKeyedObjectPoolFactory.java Thu Dec 22 19:02:25 2011
@@ -115,18 +115,21 @@ public class StackKeyedObjectPoolFactory
      * KeyedPoolableObjectFactory used by StackKeyedObjectPools created by this factory
      * @deprecated to be removed in pool 2.0 
      */
+    @Deprecated
     protected KeyedPoolableObjectFactory<K, V> _factory = null;
     
     /** 
      * Maximum number of idle instances in each keyed pool for StackKeyedObjectPools created by this factory
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
     protected int _maxSleeping = StackKeyedObjectPool.DEFAULT_MAX_SLEEPING;
     
     /**
      * Initial capacity of StackKeyedObjectPools created by this factory.
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
     protected int _initCapacity = StackKeyedObjectPool.DEFAULT_INIT_SLEEPING_CAPACITY;
 
     /**

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPool.java Thu Dec 22 19:02:25 2011
@@ -57,6 +57,7 @@ public class StackObjectPool<T> extends 
      * @see #StackObjectPool(PoolableObjectFactory)
      * @deprecated to be removed in pool 2.0 - use {@link #StackObjectPool(PoolableObjectFactory)}
      */
+    @Deprecated
     public StackObjectPool() {
         this(null,DEFAULT_MAX_SLEEPING,DEFAULT_INIT_SLEEPING_CAPACITY);
     }
@@ -72,6 +73,7 @@ public class StackObjectPool<T> extends 
      * @see #StackObjectPool(PoolableObjectFactory, int)
      * @deprecated to be removed in pool 2.0 - use {@link #StackObjectPool(PoolableObjectFactory, int)}
      */
+    @Deprecated
     public StackObjectPool(int maxIdle) {
         this(null,maxIdle,DEFAULT_INIT_SLEEPING_CAPACITY);
     }
@@ -89,6 +91,7 @@ public class StackObjectPool<T> extends 
      * @see #StackObjectPool(PoolableObjectFactory, int, int)
      * @deprecated to be removed in pool 2.0 - use {@link #StackObjectPool(PoolableObjectFactory, int, int)}
      */
+    @Deprecated
     public StackObjectPool(int maxIdle, int initIdleCapacity) {
         this(null,maxIdle,initIdleCapacity);
     }
@@ -158,6 +161,7 @@ public class StackObjectPool<T> extends 
      * 
      * @return an instance from the pool
      */
+    @Override
     public synchronized T borrowObject() throws Exception {
         assertOpen();
         T obj = null;
@@ -220,6 +224,7 @@ public class StackObjectPool<T> extends 
      * 
      * @param obj instance to return to the pool
      */
+    @Override
     public synchronized void returnObject(T obj) throws Exception {
         boolean success = !isClosed();
         if(null != _factory) {
@@ -260,6 +265,7 @@ public class StackObjectPool<T> extends 
     /**
      * {@inheritDoc}
      */
+    @Override
     public synchronized void invalidateObject(T obj) throws Exception {
         _numActive--;
         if (null != _factory) {
@@ -274,6 +280,7 @@ public class StackObjectPool<T> extends 
      *
      * @return the number of instances currently idle in this pool
      */
+    @Override
     public synchronized int getNumIdle() {
         return _pool.size();
     }
@@ -283,6 +290,7 @@ public class StackObjectPool<T> extends 
      *
      * @return the number of instances currently borrowed from this pool
      */
+    @Override
     public synchronized int getNumActive() {
         return _numActive;
     }
@@ -291,6 +299,7 @@ public class StackObjectPool<T> extends 
      * Clears any objects sitting idle in the pool. Silently swallows any
      * exceptions thrown by {@link PoolableObjectFactory#destroyObject(Object)}.
      */
+    @Override
     public synchronized void clear() {
         if(null != _factory) {
             Iterator<T> it = _pool.iterator();
@@ -315,6 +324,7 @@ public class StackObjectPool<T> extends 
      *
      * @throws Exception never - exceptions clearing the pool are swallowed
      */
+    @Override
     public void close() throws Exception {
         super.close();
         clear();
@@ -338,6 +348,7 @@ public class StackObjectPool<T> extends 
      * 
      * @throws Exception when the {@link #getFactory() factory} has a problem creating or passivating an object.
      */
+    @Override
     public synchronized void addObject() throws Exception {
         assertOpen();
         if (_factory == null) {
@@ -384,6 +395,8 @@ public class StackObjectPool<T> extends 
      * @throws IllegalStateException when the factory cannot be set at this time
      * @deprecated to be removed in pool 2.0
      */
+    @Deprecated
+    @Override
     public synchronized void setFactory(PoolableObjectFactory<T> factory) throws IllegalStateException {
         assertOpen();
         if(0 < getNumActive()) {
@@ -410,24 +423,28 @@ public class StackObjectPool<T> extends 
      * My pool.
      * @deprecated to be made private in pool 2.0 
      */
+    @Deprecated
     protected Stack<T> _pool = null;
 
     /** 
      * My {@link PoolableObjectFactory}.
      * @deprecated to be made private in pool 2.0 - use {@link #getFactory()}
      */
+    @Deprecated
     protected PoolableObjectFactory<T> _factory = null;
 
     /** 
      * The cap on the number of "sleeping" instances in the pool. 
      * @deprecated to be made private in pool 2.0 - use {@link #getMaxSleeping()}
      */
+    @Deprecated
     protected int _maxSleeping = DEFAULT_MAX_SLEEPING;
     
     /**
      * Number of objects borrowed but not yet returned to the pool.
      * @deprecated to be made private in pool 2.0 - use {@link #getNumActive()}
      */
+    @Deprecated
     protected int _numActive = 0;
 
     /**

Modified: commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPoolFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPoolFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/StackObjectPoolFactory.java Thu Dec 22 19:02:25 2011
@@ -40,6 +40,7 @@ public class StackObjectPoolFactory<T> i
      * @see StackObjectPool#StackObjectPool()
      * @deprecated to be removed in pool 2.0 - use {@link #StackObjectPoolFactory(PoolableObjectFactory)}
      */
+    @Deprecated
     public StackObjectPoolFactory() {
         this(null,StackObjectPool.DEFAULT_MAX_SLEEPING,StackObjectPool.DEFAULT_INIT_SLEEPING_CAPACITY);
     }
@@ -51,6 +52,7 @@ public class StackObjectPoolFactory<T> i
      * @see StackObjectPool#StackObjectPool(int)
      * @deprecated to be removed in pool 2.0 - use {@link #StackObjectPoolFactory(PoolableObjectFactory, int)}
      */
+    @Deprecated
     public StackObjectPoolFactory(int maxIdle) {
         this(null,maxIdle,StackObjectPool.DEFAULT_INIT_SLEEPING_CAPACITY);
     }
@@ -64,6 +66,7 @@ public class StackObjectPoolFactory<T> i
      * @see StackObjectPool#StackObjectPool(int, int)
      * @deprecated to be removed in pool 2.0 - use {@link #StackObjectPoolFactory(PoolableObjectFactory, int, int)}
      */
+    @Deprecated
     public StackObjectPoolFactory(int maxIdle, int initIdleCapacity) {
         this(null,maxIdle,initIdleCapacity);
     }
@@ -115,18 +118,21 @@ public class StackObjectPoolFactory<T> i
      * The PoolableObjectFactory used by created pools.
      * @deprecated to be made private in pool 2.0
      */
+    @Deprecated
     protected PoolableObjectFactory<T> _factory = null;
     
     /**
      * The maximum number of idle instances in created pools.
      * @deprecated to be made private in pool 2.0
      */
+    @Deprecated
     protected int _maxSleeping = StackObjectPool.DEFAULT_MAX_SLEEPING;
     
     /**
      * The initial size of created pools.
      * @deprecated to be made private in pool 2.0
      */
+    @Deprecated
     protected int _initCapacity = StackObjectPool.DEFAULT_INIT_SLEEPING_CAPACITY;
 
     /**

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java Thu Dec 22 19:02:25 2011
@@ -77,6 +77,7 @@ public class MethodCall {
         return this;
     }
 
+    @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
@@ -90,6 +91,7 @@ public class MethodCall {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int result;
         result = (name != null ? name.hashCode() : 0);
@@ -98,6 +100,7 @@ public class MethodCall {
         return result;
     }
 
+    @Override
     public String toString() {
         final StringBuffer sb = new StringBuffer();
         sb.append("MethodCall");

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java Thu Dec 22 19:02:25 2011
@@ -29,6 +29,7 @@ public class TestBaseKeyedObjectPool<K, 
         super(testName);
     }
 
+    @Override
     protected KeyedObjectPool<Object, Integer> makeEmptyPool(KeyedPoolableObjectFactory<Object, Integer> factory) {
         if (this.getClass() != TestBaseKeyedObjectPool.class) {
             fail("Subclasses of TestBaseKeyedObjectPool must reimplement this method.");
@@ -69,10 +70,12 @@ public class TestBaseKeyedObjectPool<K, 
         throw new UnsupportedOperationException("BaseKeyedObjectPool isn't a complete implementation.");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     public void tearDown() throws Exception {
         _pool = null;
         super.tearDown();
@@ -83,11 +86,14 @@ public class TestBaseKeyedObjectPool<K, 
             return; // skip redundant tests
         }
         KeyedObjectPool<String, String> pool = new BaseKeyedObjectPool<String, String>() { 
+            @Override
             public String borrowObject(String key) {
                 return null;
             }
+            @Override
             public void returnObject(String key, String obj) {
             }
+            @Override
             public void invalidateObject(String key, String obj) {
             }            
         };

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java Thu Dec 22 19:02:25 2011
@@ -29,6 +29,7 @@ public class TestBaseKeyedPoolableObject
 
     public void testDefaultMethods() throws Exception {
         KeyedPoolableObjectFactory<String, Object> factory = new BaseKeyedPoolableObjectFactory<String, Object>() { 
+            @Override
             public Object makeObject(String key) throws Exception {
                 return null;
             }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBaseObjectPool.java Thu Dec 22 19:02:25 2011
@@ -36,6 +36,7 @@ public class TestBaseObjectPool<T> exten
         throw new UnsupportedOperationException("BaseObjectPool isn't a complete implementation.");
     }
 
+    @Override
     protected ObjectPool<Integer> makeEmptyPool(final PoolableObjectFactory<Integer> factory) {
         if (this.getClass() != TestBaseObjectPool.class) {
             fail("Subclasses of TestBaseObjectPool must reimplement this method.");
@@ -70,11 +71,14 @@ public class TestBaseObjectPool<T> exten
             return; // skip redundant tests
         }
         ObjectPool<Object> pool = new BaseObjectPool<Object>() { 
+            @Override
             public Object borrowObject() {
                 return null;
             }
+            @Override
             public void returnObject(Object obj) {
             }
+            @Override
             public void invalidateObject(Object obj) {
             }            
         };   
@@ -106,11 +110,14 @@ public class TestBaseObjectPool<T> exten
 
     public void testClose() throws Exception {
         ObjectPool<Object> pool = new BaseObjectPool<Object>() {
+            @Override
             public Object borrowObject() {
                 return null;
             }
+            @Override
             public void returnObject(Object obj) {
             }
+            @Override
             public void invalidateObject(Object obj) {
             }
         };

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java Thu Dec 22 19:02:25 2011
@@ -29,6 +29,7 @@ public class TestBasePoolableObjectFacto
 
     public void testDefaultMethods() throws Exception {
         PoolableObjectFactory<Object> factory = new BasePoolableObjectFactory<Object>() { 
+            @Override
             public Object makeObject() throws Exception {
                 return null;
             }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestKeyedObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestKeyedObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestKeyedObjectPool.java Thu Dec 22 19:02:25 2011
@@ -50,6 +50,7 @@ public abstract class TestKeyedObjectPoo
         final KeyedObjectPool<Object, Integer> pool;
         try {
             pool = makeEmptyPool(new BaseKeyedPoolableObjectFactory<Object, Integer>() {
+                @Override
                 public Integer makeObject(final Object key) throws Exception {
                     return new Integer(1234567890);
                 }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestPoolUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestPoolUtils.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestPoolUtils.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/TestPoolUtils.java Thu Dec 22 19:02:25 2011
@@ -184,10 +184,13 @@ public class TestPoolUtils extends TestC
         assertEquals(expectedMethods, calledMethods);
 
         op = new BaseObjectPool<Object>() {
+            @Override
             public Object borrowObject() throws Exception {
                 return new Integer(0);
             }
+            @Override
             public void returnObject(Object obj) {}
+            @Override
             public void invalidateObject(Object obj) {}
         };
         // cast to ObjectPool to be able to use String.class
@@ -240,12 +243,15 @@ public class TestPoolUtils extends TestC
 
 
         op = new BaseKeyedObjectPool<Object, Object>() {
+            @Override
             public Integer borrowObject(Object key) {
                 return new Integer(0);
             }
 
+            @Override
             public void returnObject(Object key, Object obj) {}
 
+            @Override
             public void invalidateObject(Object key, Object obj) {}
         };
         @SuppressWarnings("rawtypes")
@@ -649,6 +655,7 @@ public class TestPoolUtils extends TestC
 
         final List<String> calledMethods = new ArrayList<String>();
         final InvocationHandler handler = new MethodCallLogger(calledMethods) {
+            @Override
             public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
                 Object o = super.invoke(proxy, method, args);
                 if (o instanceof Integer) {
@@ -740,6 +747,7 @@ public class TestPoolUtils extends TestC
 
         final List<String> calledMethods = new ArrayList<String>();
         final InvocationHandler handler = new MethodCallLogger(calledMethods) {
+            @Override
             public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
                 Object o = super.invoke(proxy, method, args);
                 if (o instanceof Integer) {
@@ -819,6 +827,7 @@ public class TestPoolUtils extends TestC
 
         final List<String> calledMethods = new ArrayList<String>();
         final InvocationHandler handler = new MethodCallLogger(calledMethods) {
+            @Override
             public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
                 Object o = super.invoke(proxy, method, args);
                 if (o instanceof Integer) {

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/VisitTracker.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/VisitTracker.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/VisitTracker.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/VisitTracker.java Thu Dec 22 19:02:25 2011
@@ -93,6 +93,7 @@ public class VisitTracker<K> {
     public K getKey() {
         return key;
     }
+    @Override
     public String toString() {
         return "Key: " + key + " id: " + id;
     }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java Thu Dec 22 19:02:25 2011
@@ -40,6 +40,7 @@ public class TestGenericKeyedObjectPool 
         super(testName);
     }
 
+    @Override
     protected KeyedObjectPool<Object, String> makeEmptyPool(int mincapacity) {
         GenericKeyedObjectPool<Object, String> pool = new GenericKeyedObjectPool<Object, String>(
             new KeyedPoolableObjectFactory<Object, String>()  {
@@ -64,14 +65,17 @@ public class TestGenericKeyedObjectPool 
         return pool;
     }
 
+    @Override
     protected KeyedObjectPool<Object, Integer> makeEmptyPool(KeyedPoolableObjectFactory<Object, Integer> factory) {
         return new GenericKeyedObjectPool<Object, Integer>(factory);
     }
 
+    @Override
     protected String getNthObject(Object key, int n) {
         return String.valueOf(key) + String.valueOf(n);
     }
 
+    @Override
     protected Object makeKey(int n) {
         return String.valueOf(n);
     }
@@ -81,11 +85,13 @@ public class TestGenericKeyedObjectPool 
     private final Integer one = new Integer(1);
     private final Integer two = new Integer(2);
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         pool = new GenericKeyedObjectPool<String, String>(new SimpleFactory<String>());
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         pool.clear();
@@ -1527,6 +1533,7 @@ public class TestGenericKeyedObjectPool 
             _thrown = null;
         }
 
+        @Override
         public void run() {
             try {
                 preborrow = System.currentTimeMillis();
@@ -1712,10 +1719,12 @@ public class TestGenericKeyedObjectPool 
         }
     }
 
+    @Override
     protected boolean isLifo() {
         return true;
     }
 
+    @Override
     protected boolean isFifo() {
         return false;
     }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java Thu Dec 22 19:02:25 2011
@@ -32,6 +32,7 @@ public class TestGenericKeyedObjectPoolF
         super(name);
     }
 
+    @Override
     protected KeyedObjectPoolFactory<Object, Integer> makeFactory(final KeyedPoolableObjectFactory<Object, Integer> objectFactory) {
         return new GenericKeyedObjectPoolFactory<Object, Integer>(objectFactory);
     }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java Thu Dec 22 19:02:25 2011
@@ -40,6 +40,7 @@ public class TestGenericObjectPool exten
         super(testName);
     }
 
+    @Override
     protected ObjectPool<String> makeEmptyPool(int mincap) {
        GenericObjectPool<String> pool = new GenericObjectPool<String>(new SimpleFactory());
        pool.setMaxActive(mincap);
@@ -47,19 +48,23 @@ public class TestGenericObjectPool exten
        return pool;
     }
 
+    @Override
     protected ObjectPool<Integer> makeEmptyPool(final PoolableObjectFactory<Integer> factory) {
         return new GenericObjectPool<Integer>(factory);
     }
 
+    @Override
     protected String getNthObject(int n) {
         return String.valueOf(n);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         pool = new GenericObjectPool<String>(new SimpleFactory());
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         pool.clear();
@@ -1017,6 +1022,7 @@ public class TestGenericObjectPool exten
             public TimeTest() {
                 createTime = System.currentTimeMillis();
             }
+            @Override
             public TimeTest makeObject() throws Exception {
                 return new TimeTest();
             }
@@ -1224,6 +1230,7 @@ public class TestGenericObjectPool exten
             this.borrow = borrow;
         }
 
+        @Override
         public void run() {
             try {
                 if (borrow) {
@@ -1559,10 +1566,12 @@ public class TestGenericObjectPool exten
             }
         }
     }
+    @Override
     protected boolean isLifo() {
         return true;
     }
 
+    @Override
     protected boolean isFifo() {
         return false;
     }
@@ -1682,6 +1691,7 @@ public class TestGenericObjectPool exten
             _thrown = null;
         }
 
+        @Override
         public void run() {
             try {
                 preborrow = System.currentTimeMillis();

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java Thu Dec 22 19:02:25 2011
@@ -35,6 +35,7 @@ public class TestGenericObjectPoolFactor
         super(name);
     }
 
+    @Override
     protected ObjectPoolFactory<Integer> makeFactory(final PoolableObjectFactory<Integer> objectFactory) throws UnsupportedOperationException {
         return new GenericObjectPoolFactory<Integer>(objectFactory);
     }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java Thu Dec 22 19:02:25 2011
@@ -38,6 +38,7 @@ public class TestSoftRefOutOfMemory exte
         super(testName);
     }
 
+    @Override
     public void tearDown() throws Exception {
         if (pool != null) {
             pool.close();
@@ -160,6 +161,7 @@ public class TestSoftRefOutOfMemory exte
      */
     public void testOutOfMemoryError() throws Exception {
         pool = new SoftReferenceObjectPool<String>(new BasePoolableObjectFactory<String>() {
+            @Override
             public String makeObject() throws Exception {
                 throw new OutOfMemoryError();
             }
@@ -175,10 +177,12 @@ public class TestSoftRefOutOfMemory exte
         pool.close();
 
         pool = new SoftReferenceObjectPool<String>(new BasePoolableObjectFactory<String>() {
+            @Override
             public String makeObject() throws Exception {
                 return new String();
             }
 
+            @Override
             public boolean validateObject(String obj) {
                 throw new OutOfMemoryError();
             }
@@ -194,14 +198,17 @@ public class TestSoftRefOutOfMemory exte
         pool.close();
         
         pool = new SoftReferenceObjectPool<String>(new BasePoolableObjectFactory<String>() {
+            @Override
             public String makeObject() throws Exception {
                 return new String();
             }
 
+            @Override
             public boolean validateObject(String obj) {
                 throw new IllegalAccessError();
             }
 
+            @Override
             public void destroyObject(String obj) throws Exception {
                 throw new OutOfMemoryError();
             }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java Thu Dec 22 19:02:25 2011
@@ -31,6 +31,7 @@ public class TestSoftReferenceObjectPool
         super(testName);
     }
 
+    @Override
     protected ObjectPool<String> makeEmptyPool(int cap) {
         return new SoftReferenceObjectPool<String>(
             new PoolableObjectFactory<String>()  {
@@ -44,18 +45,22 @@ public class TestSoftReferenceObjectPool
             );
     }
 
+    @Override
     protected ObjectPool<Integer> makeEmptyPool(final PoolableObjectFactory<Integer> factory) {
         return new SoftReferenceObjectPool<Integer>(factory);
     }
 
+    @Override
     protected String getNthObject(int n) {
         return String.valueOf(n);
     }
 
+    @Override
     protected boolean isLifo() {
         return false;
     }
 
+    @Override
     protected boolean isFifo() {
         return false;
     }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java Thu Dec 22 19:02:25 2011
@@ -34,25 +34,30 @@ public class TestStackKeyedObjectPool ex
         super(testName);
     }
 
+    @Override
     protected KeyedObjectPool<String, String> makeEmptyPool(int mincapacity) {
         StackKeyedObjectPool<String, String> pool = new StackKeyedObjectPool<String, String>(new SimpleFactory(),mincapacity);
         return pool;
     }
 
+    @Override
     protected KeyedObjectPool<Object, Integer> makeEmptyPool(KeyedPoolableObjectFactory<Object, Integer> factory) {
         return new StackKeyedObjectPool<Object, Integer>(factory);
     }
 
+    @Override
     protected String getNthObject(Object key, int n) {
         return String.valueOf(key) + String.valueOf(n);
     }
 
+    @Override
     protected String makeKey(int n) {
         return String.valueOf(n);
     }
 
     private StackKeyedObjectPool<String, String> pool = null;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         pool = new StackKeyedObjectPool<String, String>(
@@ -68,6 +73,7 @@ public class TestStackKeyedObjectPool ex
     }
 
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         pool = null;
@@ -180,6 +186,7 @@ public class TestStackKeyedObjectPool ex
         }
     }
 
+    @Override
     public void testToString() throws Exception {
         StackKeyedObjectPool<String, String> pool = new StackKeyedObjectPool<String, String>(new SimpleFactory());
         assertNotNull(pool.toString());
@@ -309,10 +316,12 @@ public class TestStackKeyedObjectPool ex
         public void passivateObject(String key, String obj) { }
     }
 
+    @Override
     protected boolean isLifo() {
         return true;
     }
 
+    @Override
     protected boolean isFifo() {
         return false;
     }

Modified: commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java?rev=1222396&r1=1222395&r2=1222396&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java (original)
+++ commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java Thu Dec 22 19:02:25 2011
@@ -32,6 +32,7 @@ public class TestStackKeyedObjectPoolFac
         super(name);
     }
 
+    @Override
     protected KeyedObjectPoolFactory<Object, Integer> makeFactory(final KeyedPoolableObjectFactory<Object, Integer> objectFactory) throws UnsupportedOperationException {
         return new StackKeyedObjectPoolFactory<Object, Integer>(objectFactory);
     }



Mime
View raw message