Bug 548309 - Use jdk 5 for-each loop (org.eclipse.jdt.junit)
Replace more uses of Iterator with a corresponding for-loop. Add
missing braces on loops as necessary.
Change-Id: Ia3b348acac9e549fb632d1d76efc28acd3f8c6c0
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java
index 6322c91..830d3d3 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java
@@ -93,8 +93,7 @@
IClasspathEntry[] oldEntries= project.getRawClasspath();
ArrayList<IClasspathEntry> newEntries= new ArrayList<>(oldEntries.length + 1);
boolean added= false;
- for (int i= 0; i < oldEntries.length; i++) {
- IClasspathEntry curr= oldEntries[i];
+ for (IClasspathEntry curr : oldEntries) {
if (curr.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
IPath path= curr.getPath();
if (path.equals(entry.getPath())) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitClasspathFixProcessor.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitClasspathFixProcessor.java
index 2b7de1f..018ccc1 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitClasspathFixProcessor.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitClasspathFixProcessor.java
@@ -78,8 +78,7 @@
IClasspathEntry[] oldEntries= fProject.getRawClasspath();
ArrayList<IClasspathEntry> newEntries= new ArrayList<>(oldEntries.length + 1);
boolean added= false;
- for (int i= 0; i < oldEntries.length; i++) {
- IClasspathEntry curr= oldEntries[i];
+ for (IClasspathEntry curr : oldEntries) {
if (curr.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
IPath path= curr.getPath();
if (path.equals(entry.getPath())) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
index 88e1e10..e92ef96 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
@@ -1045,9 +1045,10 @@
if (affectedChildren == null)
return true;
- for (int i= 0; i < affectedChildren.length; i++) {
- if (!processDelta(affectedChildren[i]))
+ for (IJavaElementDelta affectedChild : affectedChildren) {
+ if (!processDelta(affectedChild)) {
return false;
+ }
}
return true;
}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/Resources.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/Resources.java
index 73d0114..d1303ac 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/Resources.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/Resources.java
@@ -60,8 +60,7 @@
*/
public static IStatus checkInSync(IResource[] resources) {
IStatus result= null;
- for (int i= 0; i < resources.length; i++) {
- IResource resource= resources[i];
+ for (IResource resource : resources) {
if (!resource.isSynchronized(IResource.DEPTH_INFINITE)) {
result= addOutOfSync(result, resource);
}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageTwo.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageTwo.java
index 68bf282..4288add 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageTwo.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageTwo.java
@@ -298,15 +298,16 @@
*/
public IMethod[] getCheckedMethods() {
int methodCount= 0;
- for (int i = 0; i < fCheckedObjects.length; i++) {
- if (fCheckedObjects[i] instanceof IMethod)
+ for (Object fCheckedObject : fCheckedObjects) {
+ if (fCheckedObject instanceof IMethod) {
methodCount++;
+ }
}
IMethod[] checkedMethods= new IMethod[methodCount];
int j= 0;
- for (int i = 0; i < fCheckedObjects.length; i++) {
- if (fCheckedObjects[i] instanceof IMethod) {
- checkedMethods[j]= (IMethod)fCheckedObjects[i];
+ for (Object fCheckedObject : fCheckedObjects) {
+ if (fCheckedObject instanceof IMethod) {
+ checkedMethods[j]= (IMethod) fCheckedObject;
j++;
}
}
@@ -328,8 +329,7 @@
try {
IMethod[] currMethods= type.getMethods();
for_currMethods:
- for (int j = 0; j < currMethods.length; j++) {
- IMethod currMethod = currMethods[j];
+ for (IMethod currMethod : currMethods) {
int flags= currMethod.getFlags();
if (!Flags.isPrivate(flags) && !Flags.isSynthetic(flags)) {
for (int k = 0; k < methods.size(); k++) {
@@ -360,9 +360,9 @@
if (parentElement instanceof IType) {
IType parentType= (IType)parentElement;
ArrayList<IMethod> result= new ArrayList<>(fMethods.length);
- for (int i= 0; i < fMethods.length; i++) {
- if (fMethods[i].getDeclaringType().equals(parentType)) {
- result.add(fMethods[i]);
+ for (IMethod fMethod : fMethods) {
+ if (fMethod.getDeclaringType().equals(parentType)) {
+ result.add(fMethod);
}
}
return result.toArray();
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
index e35c384..be0c1ba 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
@@ -527,9 +527,8 @@
String typeName= getTypeName();
JUnitStatus status= new JUnitStatus();
Object[] checkedClasses= fClassesInSuiteTable.getCheckedElements();
- for (int i= 0; i < checkedClasses.length; i++) {
- IType checkedClass= (IType)checkedClasses[i];
- if (checkedClass.getElementName().equals(typeName)){
+ for (Object checkedClass : checkedClasses) {
+ if (((IType)checkedClass).getElementName().equals(typeName)){
status.setWarning(WizardMessages.NewTestSuiteCreationWizardPage_infinite_recursion);
return status;
}
