You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by fr...@apache.org on 2009/02/05 04:09:36 UTC
svn commit: r740984 -
/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/CacheMap.java
Author: froethenbacher
Date: Thu Feb 5 03:09:36 2009
New Revision: 740984
URL: http://svn.apache.org/viewvc?rev=740984&view=rev
Log:
[MIGRATION] Removed dependency on LogEnabled and used commons-logging instead.
Modified:
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/CacheMap.java
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/CacheMap.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/CacheMap.java?rev=740984&r1=740983&r2=740984&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/CacheMap.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/CacheMap.java Thu Feb 5 03:09:36 2009
@@ -25,13 +25,12 @@
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
/**
* A map with a maximum capacity. When the map is full, the oldest entry is removed.
*/
-public class CacheMap extends HashMap implements LogEnabled {
+public class CacheMap extends HashMap {
/**
*
@@ -43,15 +42,14 @@
* @param _capacity The maximum number of entries.
* @param logger The logger.
*/
- public CacheMap(int _capacity, Logger logger) {
- enableLogging(logger);
+ public CacheMap(int _capacity, Log logger) {
assert _capacity > -1;
this.capacity = _capacity;
}
private int capacity;
private SortedMap timeToKey = new TreeMap();
- private Logger logger;
+ private Log logger;
/**
* @see java.util.Map#put(Object, Object)
@@ -63,8 +61,8 @@
Object oldestKey = this.timeToKey.get(timeKey);
this.timeToKey.remove(timeKey);
remove(oldestKey);
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("Clearing cache");
+ if (logger.isDebugEnabled()) {
+ logger.debug("Clearing cache");
}
}
this.timeToKey.put(new Date(), key);
@@ -76,23 +74,15 @@
*/
public Object get(Object key) {
Object result = super.get(key);
- if (getLogger().isDebugEnabled()) {
+ if (logger.isDebugEnabled()) {
if (result != null) {
- getLogger().debug("Using cached object for key [" + key + "]");
+ logger.debug("Using cached object for key [" + key + "]");
}
else {
- getLogger().debug("No cached object for key [" + key + "]");
+ logger.debug("No cached object for key [" + key + "]");
}
}
return result;
}
- protected Logger getLogger() {
- return this.logger;
- }
-
- public void enableLogging(Logger logger) {
- this.logger = logger;
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org