You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2011/10/31 15:35:08 UTC
svn commit: r1195479 - in /commons/proper/vfs/trunk/core/src:
main/java/org/apache/commons/vfs2/impl/
main/java/org/apache/commons/vfs2/operations/
main/java/org/apache/commons/vfs2/provider/
main/java/org/apache/commons/vfs2/provider/ftp/ main/java/or...
Author: ggregory
Date: Mon Oct 31 14:35:07 2011
New Revision: 1195479
URL: http://svn.apache.org/viewvc?rev=1195479&view=rev
Log:
Use Java 5 enhanced loops.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ContentTests.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderCacheStrategyTests.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileMonitor.java Mon Oct 31 14:35:07 2011
@@ -179,9 +179,9 @@ public class DefaultFileMonitor implemen
{
// Traverse the children
final FileObject[] children = file.getChildren();
- for (int i = 0; i < children.length; i++)
+ for (FileObject element : children)
{
- doAddFile(children[i]);
+ doAddFile(element);
}
}
}
@@ -215,9 +215,9 @@ public class DefaultFileMonitor implemen
{
// Traverse the children
final FileObject[] children = file.getChildren();
- for (int i = 0; i < children.length; i++)
+ for (FileObject element : children)
{
- this.addFile(children[i]); // Add depth first
+ this.addFile(element); // Add depth first
}
}
@@ -475,9 +475,9 @@ public class DefaultFileMonitor implemen
{
this.children = new HashMap<FileName, Object>();
FileObject[] childrenList = this.file.getChildren();
- for (int i = 0; i < childrenList.length; i++)
+ for (FileObject element : childrenList)
{
- this.children.put(childrenList[i].getName(), new
+ this.children.put(element.getName(), new
Object()); // null?
}
}
@@ -538,9 +538,9 @@ public class DefaultFileMonitor implemen
if (child.getType().hasChildren())
{
FileObject[] newChildren = child.getChildren();
- for (int i = 0; i < newChildren.length; i++)
+ for (FileObject element : newChildren)
{
- fireAllCreate(newChildren[i]);
+ fireAllCreate(element);
}
}
}
@@ -602,11 +602,11 @@ public class DefaultFileMonitor implemen
{
this.children = new HashMap<FileName, Object>();
}
- for (int i = 0; i < newChildren.length; i++)
+ for (FileObject element : newChildren)
{
- this.children.put(newChildren[i].getName(), new
+ this.children.put(element.getName(), new
Object()); // null?
- this.fireAllCreate(newChildren[i]);
+ this.fireAllCreate(element);
}
}
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java Mon Oct 31 14:35:07 2011
@@ -23,7 +23,6 @@ import java.net.URLStreamHandlerFactory;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -172,9 +171,8 @@ public class DefaultFileSystemManager im
final FileProvider provider) throws FileSystemException
{
// Warn about duplicate providers
- for (int i = 0; i < urlSchemes.length; i++)
+ for (final String scheme : urlSchemes)
{
- final String scheme = urlSchemes[i];
if (providers.containsKey(scheme))
{
throw new FileSystemException(
@@ -186,9 +184,8 @@ public class DefaultFileSystemManager im
setupComponent(provider);
// Add to map
- for (int i = 0; i < urlSchemes.length; i++)
+ for (final String scheme : urlSchemes)
{
- final String scheme = urlSchemes[i];
providers.put(scheme, provider);
}
@@ -520,10 +517,8 @@ public class DefaultFileSystemManager im
}
// Close the providers.
- for (Iterator<?> iterator = providers.values().iterator(); iterator
- .hasNext();)
+ for (Object provider : providers.values())
{
- final Object provider = iterator.next();
closeComponent(provider);
}
@@ -553,11 +548,9 @@ public class DefaultFileSystemManager im
}
// Close the providers.
- for (Iterator<FileProvider> iterator = providers.values().iterator(); iterator
- .hasNext();)
+ for (FileProvider fileProvider : providers.values())
{
- final AbstractFileProvider provider = (AbstractFileProvider) iterator
- .next();
+ final AbstractFileProvider provider = (AbstractFileProvider) fileProvider;
provider.freeUnusedResources();
}
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java Mon Oct 31 14:35:07 2011
@@ -391,9 +391,8 @@ public class StandardFileSystemManager
// Attach only to available schemas
final String[] schemas = getSchemas(providerDef);
- for (int i = 0; i < schemas.length; i++)
+ for (final String schema : schemas)
{
- final String schema = schemas[i];
if (hasProvider(schema))
{
final FileOperationProvider operationProvider = (FileOperationProvider) createInstance(classname);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VirtualFileSystem.java Mon Oct 31 14:35:07 2011
@@ -18,7 +18,6 @@ package org.apache.commons.vfs2.impl;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.commons.vfs2.Capability;
@@ -187,9 +186,8 @@ public class VirtualFileSystem extends A
}
// Find matching junction
- for (Iterator<FileName> iterator = junctions.keySet().iterator(); iterator.hasNext();)
+ for (FileName junctionPoint : junctions.keySet())
{
- final FileName junctionPoint = iterator.next();
if (junctionPoint.isDescendent(name))
{
return junctionPoint;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/operations/DefaultFileOperations.java Mon Oct 31 14:35:07 2011
@@ -70,10 +70,8 @@ public class DefaultFileOperations imple
final List<Class<? extends FileOperation>> operations = new ArrayList<Class<? extends FileOperation>>();
- for (int i = 0; i < providers.length; i++)
+ for (FileOperationProvider provider : providers)
{
- FileOperationProvider provider = providers[i];
-
provider.collectOperations(operations, fileObject);
}
@@ -105,10 +103,8 @@ public class DefaultFileOperations imple
FileOperation resultOperation = null;
- for (int i = 0; i < providers.length; i++)
+ for (FileOperationProvider provider : providers)
{
- FileOperationProvider provider = providers[i];
-
resultOperation = provider.getOperation(fileObject, operationClass);
if (resultOperation != null)
@@ -142,9 +138,8 @@ public class DefaultFileOperations imple
return false;
}
- for (int i = 0; i < operations.length; i++)
+ for (Class<? extends FileOperation> operation : operations)
{
- Class<? extends FileOperation> operation = operations[i];
if (operationClass.isAssignableFrom(operation))
{
return true;
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java Mon Oct 31 14:35:07 2011
@@ -788,10 +788,10 @@ public abstract class AbstractFileObject
{
// TODO - use a hashtable when there are a large number of children
FileObject[] children = getChildren();
- for (int i = 0; i < children.length; i++)
+ for (FileObject element : children)
{
// final FileObject child = children[i];
- final FileName child = children[i].getName();
+ final FileName child = element.getName();
// TODO - use a comparator to compare names
// if (child.getName().getBaseName().equals(name))
if (child.getBaseName().equals(name))
@@ -1759,9 +1759,8 @@ public abstract class AbstractFileObject
// Traverse the children
final FileObject[] children = file.getChildren();
- for (int i = 0; i < children.length; i++)
+ for (final FileObject child : children)
{
- final FileObject child = children[i];
fileInfo.setFile(child);
traverse(fileInfo, selector, depthwise, selected);
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java Mon Oct 31 14:35:07 2011
@@ -592,9 +592,8 @@ public abstract class AbstractFileSystem
if (fileListeners != null)
{
- for (int i = 0; i < fileListeners.length; i++)
+ for (final FileListener fileListener : fileListeners)
{
- final FileListener fileListener = fileListeners[i];
try
{
event.notify(fileListener);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/CompositeFileProvider.java Mon Oct 31 14:35:07 2011
@@ -57,10 +57,10 @@ public abstract class CompositeFileProvi
UriParser.extractScheme(uri, buf);
String[] schemes = getSchemes();
- for (int iterSchemes = 0; iterSchemes < schemes.length; iterSchemes++)
+ for (String scheme : schemes)
{
buf.insert(0, ":");
- buf.insert(0, schemes[iterSchemes]);
+ buf.insert(0, scheme);
}
FileObject fo = getContext().getFileSystemManager().resolveFile(buf.toString(), fileSystemOptions);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java Mon Oct 31 14:35:07 2011
@@ -196,13 +196,13 @@ public final class FtpClientFactory
if (shortMonthNames != null)
{
StringBuilder shortMonthNamesStr = new StringBuilder(BUFSZ);
- for (int i = 0; i < shortMonthNames.length; i++)
+ for (String shortMonthName : shortMonthNames)
{
if (shortMonthNamesStr.length() > 0)
{
shortMonthNamesStr.append("|");
}
- shortMonthNamesStr.append(shortMonthNames[i]);
+ shortMonthNamesStr.append(shortMonthName);
}
config.setShortMonthNames(shortMonthNamesStr.toString());
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftps/FtpsClientFactory.java Mon Oct 31 14:35:07 2011
@@ -119,13 +119,13 @@ public final class FtpsClientFactory
if (shortMonthNames != null)
{
StringBuilder shortMonthNamesStr = new StringBuilder(40);
- for (int i = 0; i < shortMonthNames.length; i++)
+ for (String shortMonthName : shortMonthNames)
{
if (shortMonthNamesStr.length() > 0)
{
shortMonthNamesStr.append("|");
}
- shortMonthNamesStr.append(shortMonthNames[i]);
+ shortMonthNamesStr.append(shortMonthName);
}
config.setShortMonthNames(shortMonthNamesStr.toString());
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java Mon Oct 31 14:35:07 2011
@@ -19,7 +19,6 @@ package org.apache.commons.vfs2.provider
import java.io.IOException;
import java.security.cert.Certificate;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.jar.Attributes;
@@ -122,9 +121,8 @@ public class JarFileObject extends ZipFi
*/
private void addAll(final Attributes src, final Map<String, Object> dest)
{
- for (Iterator<Entry<Object, Object>> iterator = src.entrySet().iterator(); iterator.hasNext();)
+ for (Entry<Object, Object> entry : src.entrySet())
{
- final Map.Entry<Object, Object> entry = iterator.next();
// final String name = entry.getKey().toString().toLowerCase();
final String name = entry.getKey().toString();
dest.put(name, entry.getValue());
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java Mon Oct 31 14:35:07 2011
@@ -249,9 +249,8 @@ public class RamFileSystem extends Abstr
memFo.createFolder();
// Import recursively
FileObject[] fos = fo.getChildren();
- for (int i = 0; i < fos.length; i++)
+ for (FileObject child : fos)
{
- FileObject child = fos[i];
this.toRamFileObject(child, root);
}
}
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpClientFactory.java Mon Oct 31 14:35:07 2011
@@ -108,9 +108,8 @@ public final class SftpClientFactory
if (identities != null)
{
- for (int iterIdentities = 0; iterIdentities < identities.length; iterIdentities++)
+ for (final File privateKeyFile : identities)
{
- final File privateKeyFile = identities[iterIdentities];
try
{
jsch.addIdentity(privateKeyFile.getAbsolutePath());
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java Mon Oct 31 14:35:07 2011
@@ -302,10 +302,8 @@ public abstract class AbstractSyncTask
final FileObject[] files = rootFile.findFiles(srcDirIsBase
? Selectors.SELECT_ALL : Selectors.SELECT_FILES);
- for (int j = 0; j < files.length; j++)
+ for (final FileObject srcFile : files)
{
- final FileObject srcFile = files[j];
-
// Build the destination file name
String relName = null;
if (srcDirName == null || !srcDirIsBase)
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java Mon Oct 31 14:35:07 2011
@@ -123,9 +123,8 @@ public class ShowFileTask
if (file.getType().hasChildren())
{
final FileObject[] children = file.getChildren();
- for (int i = 0; i < children.length; i++)
+ for (FileObject child : children)
{
- FileObject child = children[i];
if (recursive)
{
showFile(child, newPrefix);
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/Os.java Mon Oct 31 14:35:07 2011
@@ -228,9 +228,8 @@ public final class Os
*/
public static OsFamily getFamily(final String name)
{
- for (int i = 0; i < ALL_FAMILIES.length; i++)
+ for (final OsFamily osFamily : ALL_FAMILIES)
{
- final OsFamily osFamily = ALL_FAMILIES[i];
if (osFamily.getName().equalsIgnoreCase(name))
{
return osFamily;
@@ -276,9 +275,8 @@ public final class Os
{
return false;
}
- for (int i = 0; i < OS_ALL_FAMILIES.length; i++)
+ for (final OsFamily osFamily : OS_ALL_FAMILIES)
{
- final OsFamily osFamily = OS_ALL_FAMILIES[i];
if (family == osFamily)
{
return true;
@@ -300,9 +298,8 @@ public final class Os
final OsFamily family = queue.remove(0);
allFamilies.add(family);
final OsFamily[] families = family.getFamilies();
- for (int i = 0; i < families.length; i++)
+ for (OsFamily parent : families)
{
- OsFamily parent = families[i];
queue.add(parent);
}
}
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java Mon Oct 31 14:35:07 2011
@@ -162,9 +162,8 @@ public abstract class AbstractVfsTestCas
public static void assertSameMessage(final String[] messages, final Throwable throwable)
{
Throwable current = throwable;
- for (int i = 0; i < messages.length; i++)
+ for (String message : messages)
{
- String message = messages[i];
assertNotNull(current);
if (message != null)
{
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ContentTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ContentTests.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ContentTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ContentTests.java Mon Oct 31 14:35:07 2011
@@ -17,7 +17,6 @@
package org.apache.commons.vfs2.test;
import java.io.InputStream;
-import java.util.Iterator;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileObject;
@@ -51,9 +50,8 @@ public class ContentTests
private void assertSameContent(final FileInfo expected,
final FileObject folder) throws Exception
{
- for (Iterator<FileInfo> iterator = expected.children.values().iterator(); iterator.hasNext();)
+ for (FileInfo fileInfo : expected.children.values())
{
- final FileInfo fileInfo = iterator.next();
final FileObject child = folder.resolveFile(fileInfo.baseName, NameScope.CHILD);
assertTrue(child.getName().toString(), child.exists());
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderCacheStrategyTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderCacheStrategyTests.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderCacheStrategyTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderCacheStrategyTests.java Mon Oct 31 14:35:07 2011
@@ -150,9 +150,9 @@ public class ProviderCacheStrategyTests
public void assertContainsNot(FileObject[] fos, String string)
{
- for (int i = 0; i<fos.length; i++)
+ for (FileObject fo : fos)
{
- if (string.equals(fos[i].getName().getBaseName()))
+ if (string.equals(fo.getName().getBaseName()))
{
fail(string + " should not be seen");
}
@@ -161,9 +161,9 @@ public class ProviderCacheStrategyTests
public void assertContains(FileObject[] fos, String string)
{
- for (int i = 0; i<fos.length; i++)
+ for (FileObject fo : fos)
{
- if (string.equals(fos[i].getName().getBaseName()))
+ if (string.equals(fo.getName().getBaseName()))
{
return;
}
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java Mon Oct 31 14:35:07 2011
@@ -111,9 +111,8 @@ public class ProviderReadTests
assertEquals("count children of \"" + file.getName() + "\"", info.children.size(), length);
// Recursively check each child
- for (int i = 0; i < children.length; i++)
+ for (final FileObject child : children)
{
- final FileObject child = children[i];
String childName = child.getName().getBaseName();
if (childName.startsWith("."))
{
Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java?rev=1195479&r1=1195478&r2=1195479&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java Mon Oct 31 14:35:07 2011
@@ -557,9 +557,8 @@ public class ProviderWriteTests
assertEquals(names.size(), files.length);
// Check for unexpected names
- for (int i = 0; i < files.length; i++)
+ for (FileObject file : files)
{
- FileObject file = files[i];
assertTrue(names.contains(file.getName().getBaseName()));
}
}