You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rw...@apache.org on 2003/02/26 00:38:22 UTC
cvs commit: jakarta-commons/pool/src/java/org/apache/commons/pool BaseKeyedObjectPool.java BaseObjectPool.java KeyedPoolableObjectFactory.java
rwaldhoff 2003/02/25 15:38:22
Modified: pool/src/java/org/apache/commons/pool
BaseKeyedObjectPool.java BaseObjectPool.java
KeyedPoolableObjectFactory.java
Log:
some cleanup, remove deprecated methods
Revision Changes Path
1.5 +4 -24 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseKeyedObjectPool.java 30 Oct 2002 22:54:41 -0000 1.4
+++ BaseKeyedObjectPool.java 25 Feb 2003 23:38:20 -0000 1.5
@@ -74,11 +74,6 @@
public abstract void returnObject(Object key, Object obj) throws Exception;
public abstract void invalidateObject(Object key, Object obj) throws Exception;
- /** @deprecated Use {@link #getNumIdle} instead. Will be removed by release 2.0. */
- public final int numIdle(Object key) throws UnsupportedOperationException {
- return getNumIdle(key);
- }
-
/**
* Not supported in this base implementation.
*/
@@ -86,11 +81,6 @@
throw new UnsupportedOperationException();
}
- /** @deprecated Use {@link #getNumActive} instead. Will be removed by release 2.0. */
- public final int numActive(Object key) throws UnsupportedOperationException {
- return getNumActive(key);
- }
-
/**
* Not supported in this base implementation.
*/
@@ -98,21 +88,11 @@
throw new UnsupportedOperationException();
}
- /** @deprecated Use {@link #getNumIdle} instead. Will be removed by release 2.0. */
- public final int numIdle() throws UnsupportedOperationException {
- return getNumIdle();
- }
-
/**
* Not supported in this base implementation.
*/
public int getNumIdle() throws UnsupportedOperationException {
throw new UnsupportedOperationException();
- }
-
- /** @deprecated Use {@link #getNumActive} instead. Will be removed by release 2.0. */
- public final int numActive() throws UnsupportedOperationException {
- return getNumActive();
}
/**
1.7 +4 -18 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseObjectPool.java 30 Oct 2002 22:54:41 -0000 1.6
+++ BaseObjectPool.java 25 Feb 2003 23:38:21 -0000 1.7
@@ -75,24 +75,10 @@
public abstract void invalidateObject(Object obj) throws Exception;
/**
- * @deprecated Use {@link #getNumIdle} instead. Will be removed by release 2.0.
- */
- public final int numIdle() throws UnsupportedOperationException {
- return getNumIdle();
- }
-
- /**
* Not supported in this base implementation.
*/
public int getNumIdle() throws UnsupportedOperationException {
throw new UnsupportedOperationException();
- }
-
- /**
- * @deprecated Use {@link #getNumActive} instead. Will be removed by release 2.0.
- */
- public final int numActive() throws UnsupportedOperationException {
- return getNumActive();
}
/**
1.4 +9 -9 jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedPoolableObjectFactory.java
Index: KeyedPoolableObjectFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons/pool/src/java/org/apache/commons/pool/KeyedPoolableObjectFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KeyedPoolableObjectFactory.java 17 Mar 2002 14:55:21 -0000 1.3
+++ KeyedPoolableObjectFactory.java 25 Feb 2003 23:38:21 -0000 1.4
@@ -110,14 +110,14 @@
* @param key the key used when constructing the object
* @return an instance that can be served by the pool.
*/
- public abstract Object makeObject(Object key) throws Exception;
+ Object makeObject(Object key) throws Exception;
/**
* Destroy an instance no longer needed by the pool.
* @param key the key used when selecting the instance
* @param obj the instance to be destroyed
*/
- public abstract void destroyObject(Object key, Object obj) throws Exception;
+ void destroyObject(Object key, Object obj) throws Exception;
/**
* Ensures that the instance is safe to be returned by the pool.
@@ -127,19 +127,19 @@
* @return <tt>false</tt> if this <i>obj</i> is not valid and should
* be dropped from the pool, <tt>true</tt> otherwise.
*/
- public abstract boolean validateObject(Object key, Object obj);
+ boolean validateObject(Object key, Object obj);
/**
* Reinitialize an instance to be returned by the pool.
* @param key the key used when selecting the object
* @param obj the instance to be activated
*/
- public abstract void activateObject(Object key, Object obj) throws Exception;
+ void activateObject(Object key, Object obj) throws Exception;
/**
* Uninitialize an instance to be returned to the pool.
* @param key the key used when selecting the object
* @param obj the instance to be passivated
*/
- public abstract void passivateObject(Object key, Object obj) throws Exception;
+ void passivateObject(Object key, Object obj) throws Exception;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org