[jboss-cvs] JBossCache/src/org/jboss/cache/loader ...
Manik Surtani
manik at jboss.org
Mon Jun 11 08:58:16 EDT 2007
User: msurtani
Date: 07/06/11 08:58:16
Modified: src/org/jboss/cache/loader ChainingCacheLoader.java
AsyncCacheLoader.java FileCacheLoader.java
Log:
Reduce Java5 related ide generated warnings
Revision Changes Path
1.15 +16 -42 JBossCache/src/org/jboss/cache/loader/ChainingCacheLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChainingCacheLoader.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/ChainingCacheLoader.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ChainingCacheLoader.java 30 Dec 2006 19:48:44 -0000 1.14
+++ ChainingCacheLoader.java 11 Jun 2007 12:58:16 -0000 1.15
@@ -62,10 +62,8 @@
public Set<String> getChildrenNames(Fqn fqn) throws Exception
{
Set<String> answer = null;
- Iterator<CacheLoader> i = cacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : cacheLoaders)
{
- CacheLoader l = i.next();
answer = l.getChildrenNames(fqn);
if (answer != null && answer.size() > 0) break;
}
@@ -83,10 +81,8 @@
public Map get(Fqn name) throws Exception
{
Map answer = null;
- Iterator<CacheLoader> i = cacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : cacheLoaders)
{
- CacheLoader l = i.next();
answer = l.get(name);
if (answer != null) break;
}
@@ -102,10 +98,8 @@
public boolean exists(Fqn name) throws Exception
{
boolean answer = false;
- Iterator<CacheLoader> i = cacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : cacheLoaders)
{
- CacheLoader l = i.next();
answer = l.exists(name);
if (answer) break;
}
@@ -146,10 +140,8 @@
*/
public void put(Fqn name, Map attributes) throws Exception
{
- Iterator<CacheLoader> i = writeCacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : writeCacheLoaders)
{
- CacheLoader l = i.next();
l.put(name, attributes);
}
}
@@ -163,10 +155,8 @@
*/
public void put(List<Modification> modifications) throws Exception
{
- Iterator<CacheLoader> i = writeCacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : writeCacheLoaders)
{
- CacheLoader l = i.next();
l.put(modifications);
}
}
@@ -199,12 +189,7 @@
*/
public void remove(Fqn name) throws Exception
{
- Iterator<CacheLoader> i = writeCacheLoaders.iterator();
- while (i.hasNext())
- {
- CacheLoader l = i.next();
- l.remove(name);
- }
+ for (CacheLoader l : writeCacheLoaders) l.remove(name);
}
/**
@@ -215,10 +200,8 @@
*/
public void removeData(Fqn name) throws Exception
{
- Iterator<CacheLoader> i = writeCacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : writeCacheLoaders)
{
- CacheLoader l = i.next();
l.removeData(name);
}
}
@@ -240,10 +223,8 @@
*/
public void prepare(Object tx, List modifications, boolean one_phase) throws Exception
{
- Iterator<CacheLoader> i = writeCacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : writeCacheLoaders)
{
- CacheLoader l = i.next();
l.prepare(tx, modifications, one_phase);
}
}
@@ -259,10 +240,8 @@
*/
public void commit(Object tx) throws Exception
{
- Iterator<CacheLoader> i = writeCacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : writeCacheLoaders)
{
- CacheLoader l = i.next();
l.commit(tx);
}
}
@@ -275,10 +254,8 @@
*/
public void rollback(Object tx)
{
- Iterator<CacheLoader> i = writeCacheLoaders.iterator();
- while (i.hasNext())
+ for (CacheLoader l : writeCacheLoaders)
{
- CacheLoader l = i.next();
l.rollback(tx);
}
}
@@ -303,28 +280,25 @@
public void start() throws Exception
{
- Iterator<CacheLoader> it = cacheLoaders.iterator();
- while (it.hasNext())
+ for (CacheLoader cacheLoader : cacheLoaders)
{
- (it.next()).start();
+ cacheLoader.start();
}
}
public void stop()
{
- Iterator<CacheLoader> it = cacheLoaders.iterator();
- while (it.hasNext())
+ for (CacheLoader cacheLoader : cacheLoaders)
{
- (it.next()).stop();
+ cacheLoader.stop();
}
}
public void destroy()
{
- Iterator<CacheLoader> it = cacheLoaders.iterator();
- while (it.hasNext())
+ for (CacheLoader cacheLoader : cacheLoaders)
{
- (it.next()).destroy();
+ cacheLoader.destroy();
}
}
1.31 +2 -4 JBossCache/src/org/jboss/cache/loader/AsyncCacheLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AsyncCacheLoader.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/AsyncCacheLoader.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- AsyncCacheLoader.java 29 May 2007 21:22:24 -0000 1.30
+++ AsyncCacheLoader.java 11 Jun 2007 12:58:16 -0000 1.31
@@ -14,7 +14,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ArrayBlockingQueue;
@@ -192,10 +191,9 @@
{
if (config.getUseAsyncPut())
{
- Iterator<Modification> i = modifications.iterator();
- while (i.hasNext())
+ for (Modification modification : modifications)
{
- enqueue(i.next());
+ enqueue(modification);
}
}
else
1.33 +3 -5 JBossCache/src/org/jboss/cache/loader/FileCacheLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FileCacheLoader.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/FileCacheLoader.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- FileCacheLoader.java 25 Apr 2007 21:05:36 -0000 1.32
+++ FileCacheLoader.java 11 Jun 2007 12:58:16 -0000 1.33
@@ -41,7 +41,7 @@
*
* @author Bela Ban
* @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Id: FileCacheLoader.java,v 1.32 2007/04/25 21:05:36 jgreene Exp $
+ * @version $Id: FileCacheLoader.java,v 1.33 2007/06/11 12:58:16 msurtani Exp $
*/
public class FileCacheLoader extends AbstractCacheLoader
{
@@ -158,9 +158,8 @@
if (parent == null) return null;
File[] children = parent.listFiles();
Set<String> s = new HashSet<String>();
- for (int i = 0; i < children.length; i++)
+ for (File child : children)
{
- File child = children[i];
if (child.isDirectory() && child.getName().endsWith(DIR_SUFFIX))
{
String child_name = child.getName();
@@ -313,9 +312,8 @@
{
boolean success = true;
File[] subdirs = dir.listFiles();
- for (int i = 0; i < subdirs.length; i++)
+ for (File file : subdirs)
{
- File file = subdirs[i];
if (file.isFile() && file.getName().equals(DATA))
{
if (!file.delete())
More information about the jboss-cvs-commits
mailing list