rwaldhoff 02/05/03 10:01:06 Modified: pool/src/java/org/apache/commons/pool BaseKeyedObjectPool.java BaseObjectPool.java KeyedObjectPool.java Log: removed deprecated numActive/numIdle methods from KeyedObjectPool interface Revision Changes Path 1.3 +8 -8 jakarta-commons/pool/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java Index: BaseKeyedObjectPool.java =================================================================== RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BaseKeyedObjectPool.java 1 May 2002 06:33:01 -0000 1.2 +++ BaseKeyedObjectPool.java 3 May 2002 17:01:06 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java,v 1.2 2002/05/01 06:33:01 rwaldhoff Exp $ - * $Revision: 1.2 $ - * $Date: 2002/05/01 06:33:01 $ + * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseKeyedObjectPool.java,v 1.3 2002/05/03 17:01:06 rwaldhoff Exp $ + * $Revision: 1.3 $ + * $Date: 2002/05/03 17:01:06 $ * * ==================================================================== * @@ -67,13 +67,13 @@ * {@link UnsupportedOperationException}. * * @author Rodney Waldhoff - * @version $Revision: 1.2 $ $Date: 2002/05/01 06:33:01 $ + * @version $Revision: 1.3 $ $Date: 2002/05/03 17:01:06 $ */ public abstract class BaseKeyedObjectPool implements KeyedObjectPool { public abstract Object borrowObject(Object key) throws Exception; public abstract void returnObject(Object key, Object obj) throws Exception; - /** @deprecated Use {@link #getNumIdle} */ + /** @deprecated Use {@link #getNumIdle} instead. Will be removed by release 2.0. */ public final int numIdle(Object key) throws UnsupportedOperationException { return getNumIdle(key); } @@ -85,7 +85,7 @@ throw new UnsupportedOperationException(); } - /** @deprecated Use {@link #getNumActive} */ + /** @deprecated Use {@link #getNumActive} instead. Will be removed by release 2.0. */ public final int numActive(Object key) throws UnsupportedOperationException { return getNumActive(key); } @@ -97,7 +97,7 @@ throw new UnsupportedOperationException(); } - /** @deprecated Use {@link #getNumIdle} */ + /** @deprecated Use {@link #getNumIdle} instead. Will be removed by release 2.0. */ public final int numIdle() throws UnsupportedOperationException { return getNumIdle(); } @@ -109,7 +109,7 @@ throw new UnsupportedOperationException(); } - /** @deprecated Use {@link #getNumActive} */ + /** @deprecated Use {@link #getNumActive} instead. Will be removed by release 2.0. */ public final int numActive() throws UnsupportedOperationException { return getNumActive(); } 1.5 +6 -6 jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java Index: BaseObjectPool.java =================================================================== RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BaseObjectPool.java 1 May 2002 06:33:01 -0000 1.4 +++ BaseObjectPool.java 3 May 2002 17:01:06 -0000 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java,v 1.4 2002/05/01 06:33:01 rwaldhoff Exp $ - * $Revision: 1.4 $ - * $Date: 2002/05/01 06:33:01 $ + * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/BaseObjectPool.java,v 1.5 2002/05/03 17:01:06 rwaldhoff Exp $ + * $Revision: 1.5 $ + * $Date: 2002/05/03 17:01:06 $ * * ==================================================================== * @@ -67,14 +67,14 @@ * {@link UnsupportedOperationException}. * * @author Rodney Waldhoff - * @version $Revision: 1.4 $ $Date: 2002/05/01 06:33:01 $ + * @version $Revision: 1.5 $ $Date: 2002/05/03 17:01:06 $ */ public abstract class BaseObjectPool implements ObjectPool { public abstract Object borrowObject() throws Exception; public abstract void returnObject(Object obj) throws Exception; /** - * @deprecated Use {@link #getNumIdle} instead. + * @deprecated Use {@link #getNumIdle} instead. Will be removed by release 2.0. */ public final int numIdle() throws UnsupportedOperationException { return getNumIdle(); @@ -88,7 +88,7 @@ } /** - * @deprecated Use {@link #getNumActive} instead. + * @deprecated Use {@link #getNumActive} instead. Will be removed by release 2.0. */ public final int numActive() throws UnsupportedOperationException { return getNumActive(); 1.6 +4 -16 jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedObjectPool.java Index: KeyedObjectPool.java =================================================================== RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedObjectPool.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- KeyedObjectPool.java 1 May 2002 06:33:01 -0000 1.5 +++ KeyedObjectPool.java 3 May 2002 17:01:06 -0000 1.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedObjectPool.java,v 1.5 2002/05/01 06:33:01 rwaldhoff Exp $ - * $Revision: 1.5 $ - * $Date: 2002/05/01 06:33:01 $ + * $Header: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedObjectPool.java,v 1.6 2002/05/03 17:01:06 rwaldhoff Exp $ + * $Revision: 1.6 $ + * $Date: 2002/05/03 17:01:06 $ * * ==================================================================== * @@ -92,7 +92,7 @@ * </p> * * @author Rodney Waldhoff - * @version $Revision: 1.5 $ $Date: 2002/05/01 06:33:01 $ + * @version $Revision: 1.6 $ $Date: 2002/05/03 17:01:06 $ * * @see KeyedPoolableObjectFactory * @see KeyedObjectPoolFactory @@ -142,9 +142,6 @@ */ int getNumIdle(Object key) throws UnsupportedOperationException; - /** @deprecated use {@link #getNumIdle} instead. */ - int numIdle(Object key) throws UnsupportedOperationException; - /** * Returns the number of instances * currently borrowed from but not yet returned @@ -159,9 +156,6 @@ */ int getNumActive(Object key) throws UnsupportedOperationException; - /** @deprecated use {@link #getNumActive} instead. */ - int numActive(Object key) throws UnsupportedOperationException; - /** * Returns the total number of instances * currently idle in my pool (optional operation). @@ -173,9 +167,6 @@ */ int getNumIdle() throws UnsupportedOperationException; - /** @deprecated use {@link #getNumIdle} instead. */ - int numIdle() throws UnsupportedOperationException; - /** * Returns the total number of instances * current borrowed from my pool but not @@ -187,9 +178,6 @@ * @throws UnsupportedOperationException when this implementation doesn't support the operation */ int getNumActive() throws UnsupportedOperationException; - - /** @deprecated use {@link #getNumActive} instead. */ - int numActive() throws UnsupportedOperationException; /** * Clears my pool, removing all pooled instances
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>