Use jdk 5 for-each loop
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: Ic54ef9b3504ddf22abd26a9d305bb494669938c0
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/validation/MultiValidatorTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/validation/MultiValidatorTest.java
index 205eb4a..213e367 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/validation/MultiValidatorTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/validation/MultiValidatorTest.java
@@ -24,7 +24,6 @@
import static org.junit.Assert.fail;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.core.databinding.DataBindingContext;
@@ -396,8 +395,8 @@
validator = new MultiValidator() {
@Override
protected IStatus validate() {
- for (Iterator<DependencyObservable> it = dependencies.iterator(); it.hasNext();)
- ObservableTracker.getterCalled(it.next());
+ for (DependencyObservable dependencyObservable : dependencies)
+ ObservableTracker.getterCalled(dependencyObservable);
return null;
}
};
diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ViewerComparatorTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ViewerComparatorTest.java
index d08ec21..e7cd28c 100644
--- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ViewerComparatorTest.java
+++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ViewerComparatorTest.java
@@ -90,8 +90,7 @@
* @param change
*/
public void fireModelChanged(ComparatorModelChange change) {
- for (int i = 0; i < fListeners.size(); ++i) {
- IComparatorModelListener listener = fListeners.get(i);
+ for (IComparatorModelListener listener : fListeners) {
listener.modelChanged(change);
}
}
diff --git a/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/UITestHelper.java b/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/UITestHelper.java
index e9c2a03..26626ec 100644
--- a/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/UITestHelper.java
+++ b/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/UITestHelper.java
@@ -72,11 +72,7 @@
dialog = new PreferenceDialogWrapper(getShell(), manager);
dialog.create();
- for (Iterator<IPreferenceNode> iterator = manager.getElements(PreferenceManager.PRE_ORDER)
- .iterator();
- iterator.hasNext();)
- {
- IPreferenceNode node = iterator.next();
+ for (IPreferenceNode node : manager.getElements(PreferenceManager.PRE_ORDER)) {
if ( node.getId().equals(id) ) {
dialog.showPage(node);
break;
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/SWTEventHelper.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/SWTEventHelper.java
index c29e872..831af2f 100755
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/SWTEventHelper.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/SWTEventHelper.java
@@ -45,8 +45,8 @@
public static void pressKeyCodeCombination(Display display, int[] keyCodes,
boolean runEventQueue) {
- for (int i = 0; i < keyCodes.length; i++)
- keyCodeDown(display, keyCodes[i], runEventQueue);
+ for (int keyCode : keyCodes)
+ keyCodeDown(display, keyCode, runEventQueue);
for (int i = keyCodes.length - 1; i >= 0; i--)
keyCodeUp(display, keyCodes[i], runEventQueue);
}
@@ -94,8 +94,8 @@
public static void pressKeyCharCombination(Display display,
char[] keyChars, boolean runEventQueue) {
- for (int i = 0; i < keyChars.length; i++)
- keyCharDown(display, keyChars[i], runEventQueue);
+ for (char keyChar : keyChars)
+ keyCharDown(display, keyChar, runEventQueue);
for (int i = keyChars.length - 1; i >= 0; i--)
keyCharUp(display, keyChars[i], runEventQueue);
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ResourceTestHelper.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ResourceTestHelper.java
index c9ddff0..abd3498 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ResourceTestHelper.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ResourceTestHelper.java
@@ -20,7 +20,6 @@
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.core.resources.IFile;
@@ -100,8 +99,8 @@
private static void replacePositions(StringBuilder c, int origLength, String string, List<Integer> positions) {
int offset= 0;
- for (Iterator<Integer> iter = positions.iterator(); iter.hasNext();) {
- int position= iter.next().intValue();
+ for (Integer integer : positions) {
+ int position= integer.intValue();
c.replace(offset + position, offset + position + origLength, string);
offset += string.length() - origLength;
}
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/OverrideTestsSelectionProvider.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/OverrideTestsSelectionProvider.java
index c4e9f7d..7677260 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/OverrideTestsSelectionProvider.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/OverrideTestsSelectionProvider.java
@@ -74,9 +74,8 @@
*/
public void selectionChanged(final SelectionChangedEvent event) {
// pass on the notification to listeners
- Object[] listeners = selectionChangedListeners.getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
+ for (Object listener : selectionChangedListeners.getListeners()) {
+ final ISelectionChangedListener l = (ISelectionChangedListener) listener;
l.selectionChanged(event);
}
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java
index acf27be..5d497d1 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ExportFileSystemOperationTest.java
@@ -210,8 +210,7 @@
}
private void verifyFiles(List<IResource> resources) {
- for (int i = 0; i < resources.size(); i++){
- IResource resource = resources.get(i);
+ for (IResource resource : resources) {
assertTrue(
"Export should have exported " + resource.getName(),
isFile(resource));
@@ -244,8 +243,7 @@
assertEquals("Export failed to Export all directories",
folderCount, directories.size());
- for (int i = 0; i < directories.size(); i++) {
- File directory = directories.get(i);
+ for (File directory : directories) {
assertTrue("Export failed to export directory " + directory.getName(), directory.exists());
verifyFolder(directory);
}
