You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/03/30 13:43:11 UTC
svn commit: r642716 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache:
MapQueryCache.java MapQueryCacheFactory.java OSQueryCacheFactory.java
QueryCacheFactory.java
Author: aadamchik
Date: Sun Mar 30 04:43:05 2008
New Revision: 642716
URL: http://svn.apache.org/viewvc?rev=642716&view=rev
Log:
generics cleanup
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java?rev=642716&r1=642715&r2=642716&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java Sun Mar 30 04:43:05 2008
@@ -38,7 +38,7 @@
public static final int DEFAULT_CACHE_SIZE = 2000;
- protected Map map;
+ protected Map<String, CacheEntry> map;
public MapQueryCache() {
this(DEFAULT_CACHE_SIZE);
@@ -56,7 +56,7 @@
CacheEntry entry;
synchronized (this) {
- entry = (CacheEntry) map.get(key);
+ entry = map.get(key);
}
return (entry != null) ? entry.list : null;
@@ -117,9 +117,9 @@
public void removeGroup(String groupKey) {
if (groupKey != null) {
synchronized (this) {
- Iterator it = map.values().iterator();
+ Iterator<CacheEntry> it = map.values().iterator();
while (it.hasNext()) {
- CacheEntry entry = (CacheEntry) it.next();
+ CacheEntry entry = it.next();
if (entry.cacheGroups != null) {
for (int i = 0; i < entry.cacheGroups.length; i++) {
@@ -146,7 +146,7 @@
final class CacheEntry {
- List list;
+ List<?> list;
String[] cacheGroups;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java?rev=642716&r1=642715&r2=642716&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheFactory.java Sun Mar 30 04:43:05 2008
@@ -28,12 +28,12 @@
public static final String CACHE_SIZE_PROPERTY = "cayenne.MapQueryCacheFactory.cacheSize";
- public QueryCache getQueryCache(Map properties) {
+ public QueryCache getQueryCache(Map<String, String> properties) {
if(properties != null) {
- Object size = properties.get(CACHE_SIZE_PROPERTY);
+ String size = properties.get(CACHE_SIZE_PROPERTY);
if(size != null) {
try {
- return new MapQueryCache(Integer.parseInt(size.toString()));
+ return new MapQueryCache(Integer.parseInt(size));
}
catch(NumberFormatException e) {
// ignore
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java?rev=642716&r1=642715&r2=642716&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheFactory.java Sun Mar 30 04:43:05 2008
@@ -33,7 +33,7 @@
* Creates QueryCache, ignoring provided properties, and reading data from
* "oscache.properties" file instead.
*/
- public QueryCache getQueryCache(Map properties) {
+ public QueryCache getQueryCache(Map<String, String> properties) {
return new OSQueryCache();
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java?rev=642716&r1=642715&r2=642716&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheFactory.java Sun Mar 30 04:43:05 2008
@@ -31,5 +31,5 @@
/**
* Creates a new instance of the QueryCache, configuring it using provided properties.
*/
- QueryCache getQueryCache(Map properties);
+ QueryCache getQueryCache(Map<String, String> properties);
}