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: If3684ac41fffd9d15a56895bd89f03236aace7be
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
index aa53acf..8fa906a 100644
--- a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
+++ b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
@@ -20,7 +20,6 @@
import java.io.StringReader;
import java.net.Socket;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -245,8 +244,8 @@
message.append(fProcessId);
sendMessage(message.toString());
if (fEventQueue != null) {
- for (Iterator<BuildEvent> iter = fEventQueue.iterator(); iter.hasNext();) {
- processEvent(iter.next());
+ for (BuildEvent buildEvent : fEventQueue) {
+ processEvent(buildEvent);
}
fEventQueue = null;
}
@@ -274,7 +273,7 @@
return;
}
if (fEventQueue == null) {
- fEventQueue = new ArrayList<BuildEvent>(10);
+ fEventQueue = new ArrayList<>(10);
}
fEventQueue.add(event);
return;
diff --git a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
index 25ce3cf..2ce0fea 100644
--- a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
+++ b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
@@ -334,8 +334,7 @@
}
String fileName = fDebugState.getFileName(location);
int lineNumber = fDebugState.getLineNumber(location);
- for (int i = 0; i < fBreakpoints.size(); i++) {
- RemoteAntBreakpoint breakpoint = fBreakpoints.get(i);
+ for (RemoteAntBreakpoint breakpoint : fBreakpoints) {
if (breakpoint.isAt(fileName, lineNumber)) {
return breakpoint;
}
diff --git a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java
index 2e3d912..f26e5be 100644
--- a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java
+++ b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/RemoteAntBuildListener.java
@@ -22,7 +22,6 @@
import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -285,9 +284,7 @@
protected IProcess getProcess() {
if (fProcess == null) {
if (fProcessId != null) {
- IProcess[] all = DebugPlugin.getDefault().getLaunchManager().getProcesses();
- for (int i = 0; i < all.length; i++) {
- IProcess process = all[i];
+ for (IProcess process : DebugPlugin.getDefault().getLaunchManager().getProcesses()) {
if (fProcessId.equals(process.getAttribute(AbstractEclipseBuildLogger.ANT_PROCESS_ID))) {
fProcess = process;
break;
@@ -364,8 +361,7 @@
return;
}
if (fMessageQueue != null) {
- for (Iterator<String> iter = fMessageQueue.iterator(); iter.hasNext();) {
- String oldMessage = iter.next();
+ for (String oldMessage : fMessageQueue) {
monitor.append(oldMessage);
}
fMessageQueue = null;
@@ -400,8 +396,7 @@
*/
@Override
public void launchesRemoved(ILaunch[] launches) {
- for (int i = 0; i < launches.length; i++) {
- ILaunch launch = launches[i];
+ for (ILaunch launch : launches) {
if (launch.equals(fLaunch)) {
shutDown();
return;
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
index 8bc2560..5775a94 100644
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
+++ b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
@@ -87,13 +87,12 @@
}
private static void addFiles(File dir, List<File> collection) throws IOException {
- File[] files = dir.listFiles();
List<File> subDirs = new ArrayList<>(2);
- for (int i = 0; i < files.length; i++) {
- if (files[i].isFile()) {
- collection.add(files[i]);
- } else if (files[i].isDirectory()) {
- subDirs.add(files[i]);
+ for (File file : dir.listFiles()) {
+ if (file.isFile()) {
+ collection.add(file);
+ } else if (file.isDirectory()) {
+ subDirs.add(file);
}
}
Iterator<File> iter = subDirs.iterator();
diff --git a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectHelper.java b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectHelper.java
index d55a6d6..50ea892 100644
--- a/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectHelper.java
+++ b/ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/ProjectHelper.java
@@ -127,13 +127,12 @@
}
private static void addFiles(File dir, List<File> collection) throws IOException {
- File[] files = dir.listFiles();
List<File> subDirs = new ArrayList<>(2);
- for (int i = 0; i < files.length; i++) {
- if (files[i].isFile()) {
- collection.add(files[i]);
- } else if (files[i].isDirectory()) {
- subDirs.add(files[i]);
+ for (File file : dir.listFiles()) {
+ if (file.isFile()) {
+ collection.add(file);
+ } else if (file.isDirectory()) {
+ subDirs.add(file);
}
}
Iterator<File> iter = subDirs.iterator();
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/actions/ToggleLineBreakpointAction.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/actions/ToggleLineBreakpointAction.java
index 3bd0d43..b78c383 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/actions/ToggleLineBreakpointAction.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/actions/ToggleLineBreakpointAction.java
@@ -51,9 +51,7 @@
ITextSelection textSelection = (ITextSelection) selection;
int lineNumber = textSelection.getStartLine();
- IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(IAntDebugConstants.ID_ANT_DEBUG_MODEL);
- for (int i = 0; i < breakpoints.length; i++) {
- IBreakpoint breakpoint = breakpoints[i];
+ for (IBreakpoint breakpoint : DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(IAntDebugConstants.ID_ANT_DEBUG_MODEL)) {
if (resource.equals(breakpoint.getMarker().getResource())) {
if (((ILineBreakpoint) breakpoint).getLineNumber() == (lineNumber + 1)) {
DebugUITools.deleteBreakpoints(new IBreakpoint[] { breakpoint }, part.getSite().getShell(), null);
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java
index adcd761..2a3af09 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlDocumentFormatter.java
@@ -190,10 +190,10 @@
String startOfTag = String.valueOf(buf);
- for (int i = 0; i < tagReaders.length; i++) {
- if (startOfTag.startsWith(tagReaders[i].getStartOfTag())) {
- tagReaders[i].setReader(reader);
- return tagReaders[i];
+ for (TagReader tagReader : tagReaders) {
+ if (startOfTag.startsWith(tagReader.getStartOfTag())) {
+ tagReader.setReader(reader);
+ return tagReader;
}
}
// else
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java
index 7b2e2ea..4ff4934 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/formatter/XmlFormatter.java
@@ -178,13 +178,13 @@
return true;
}
});
- for (int i = 0; i < positions.length; i++) {
+ for (Position position : positions) {
try {
- doc.addPosition(POS_CATEGORY, positions[i]);
+ doc.addPosition(POS_CATEGORY, position);
}
catch (BadLocationException e) {
- throw new IllegalArgumentException("Position outside of string. offset: " + positions[i].offset + ", length: " //$NON-NLS-1$//$NON-NLS-2$
- + positions[i].length + ", string size: " + string.length(), e); //$NON-NLS-1$
+ throw new IllegalArgumentException("Position outside of string. offset: " + position.offset + ", length: " //$NON-NLS-1$//$NON-NLS-2$
+ + position.length + ", string size: " + string.length(), e); //$NON-NLS-1$
}
}
}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java
index 30bf093..33a7860 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/text/XMLTextHover.java
@@ -80,8 +80,8 @@
HTMLPrinter.addPageProlog(buffer);
HTMLPrinter.addSmallHeader(buffer, AntEditorTextMessages.XMLTextHover_4);
HTMLPrinter.startBulletList(buffer);
- for (int i = 0; i < list.length; i++) {
- HTMLPrinter.addBullet(buffer, list[i]);
+ for (String element : list) {
+ HTMLPrinter.addBullet(buffer, element);
}
HTMLPrinter.endBulletList(buffer);
HTMLPrinter.addPageEpilog(buffer);
@@ -200,16 +200,16 @@
HTMLPrinter.addPageProlog(buffer);
if (includes != null && includes.length > 0) {
HTMLPrinter.addSmallHeader(buffer, AntEditorTextMessages.XMLTextHover_5);
- for (int i = 0; i < includes.length; i++) {
- HTMLPrinter.addBullet(buffer, includes[i]);
+ for (String include : includes) {
+ HTMLPrinter.addBullet(buffer, include);
}
}
HTMLPrinter.addParagraph(buffer, IAntCoreConstants.EMPTY_STRING);
HTMLPrinter.addParagraph(buffer, IAntCoreConstants.EMPTY_STRING);
if (excludes != null && excludes.length > 0) {
HTMLPrinter.addSmallHeader(buffer, AntEditorTextMessages.XMLTextHover_6);
- for (int i = 0; i < excludes.length; i++) {
- HTMLPrinter.addBullet(buffer, excludes[i]);
+ for (String exclude : excludes) {
+ HTMLPrinter.addBullet(buffer, exclude);
}
}
HTMLPrinter.addPageEpilog(buffer);
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java
index 7b8b90d..0cc7e1b 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java
@@ -71,9 +71,7 @@
if (classpath == null) {
return;
}
- String[] classpaths = classpath.list();
- for (int i = 0; i < classpaths.length; i++) {
- String cp = classpaths[i];
+ for (String cp : classpath.list()) {
File classpathEntry = new File(cp);
if (classpathEntry.isFile()) {
addLibrary(javaProject, new Path(classpathEntry.getAbsolutePath()), monitor);
@@ -90,9 +88,7 @@
}
private void createSourceDirectories(File destDir, String destDirName, org.apache.tools.ant.types.Path sourceDirs, IJavaProject javaProject, IProgressMonitor monitor) throws CoreException {
- String[] sourceDirectories = sourceDirs.list();
- for (int i = 0; i < sourceDirectories.length; i++) {
- String srcDir = sourceDirectories[i];
+ for (String srcDir : sourceDirs.list()) {
File srcDirectory = new File(srcDir);
String srcDirectoryName = srcDirectory.getName();
String destDirPath = destDir == null ? srcDir : destDir.getAbsolutePath();
@@ -170,8 +166,8 @@
private void addToClasspath(IJavaProject jproject, IClasspathEntry cpe, IProgressMonitor monitor) throws JavaModelException {
IClasspathEntry[] oldEntries = jproject.getRawClasspath();
- for (int i = 0; i < oldEntries.length; i++) {
- if (oldEntries[i].equals(cpe)) {
+ for (IClasspathEntry oldEntry : oldEntries) {
+ if (oldEntry.equals(cpe)) {
return;
}
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/SourceAnalyzer.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/SourceAnalyzer.java
index 89c6c66..b1c5997 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/SourceAnalyzer.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/SourceAnalyzer.java
@@ -18,7 +18,6 @@
import java.io.File;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -98,11 +97,8 @@
dir = new File(ExportUtil.getProjectRoot(currentProject), link);
}
}
- Set<String> sources = findFiles(dir, ".java"); //$NON-NLS-1$
-
// find all required classfiles for each source directory
- for (Iterator<String> iter = sources.iterator(); iter.hasNext();) {
- String srcFile = iter.next();
+ for (String srcFile : findFiles(dir, ".java")) { //$NON-NLS-1$
src2dir.put(srcFile, srcDir);
IFile classFile = currentProject.getProject().getFile(classDir + '/' + srcFile + ".class"); //$NON-NLS-1$
if (!classFile.exists()) {
@@ -126,11 +122,8 @@
*/
private static Map<String, Set<String>> determineRequiredSrcDirs(Map<String, String> src2dir, Map<String, Set<String>> srcdir2classes) {
Map<String, Set<String>> srcdir2sourcedirs = new TreeMap<>(); // map string to Set of strings
- for (Iterator<String> iter = srcdir2classes.keySet().iterator(); iter.hasNext();) {
- String srcDir = iter.next();
- Set<String> classes = srcdir2classes.get(srcDir);
- for (Iterator<String> iterator = classes.iterator(); iterator.hasNext();) {
- String classname = iterator.next();
+ for (String srcDir : srcdir2classes.keySet()) {
+ for (String classname : srcdir2classes.get(srcDir)) {
String classsrc = src2dir.get(classname);
// don't add reference to itself
if (classsrc != null && !classsrc.equals(srcDir)) {
@@ -166,12 +159,9 @@
* Check if build order is correct.
*/
private static void checkBuildOrder(EclipseClasspath classpath, String projectName, Shell shell, Map<String, Set<String>> srcdir2sourcedirs) {
- for (Iterator<String> iter = srcdir2sourcedirs.keySet().iterator(); iter.hasNext();) {
- String srcdir = iter.next();
- Set<String> sourcedirs = srcdir2sourcedirs.get(srcdir);
+ for (String srcdir : srcdir2sourcedirs.keySet()) {
int classpathIndex = classpath.srcDirs.indexOf(srcdir);
- for (Iterator<String> iterator = sourcedirs.iterator(); iterator.hasNext();) {
- String requiredSrc = iterator.next();
+ for (String requiredSrc : srcdir2sourcedirs.get(srcdir)) {
int i = classpath.srcDirs.indexOf(requiredSrc);
if (i > classpathIndex) {
String s = MessageFormat.format(DataTransferMessages.SourceAnalyzer_3, new Object[] { projectName });
@@ -231,9 +221,8 @@
private static void findFiles(File base, File dir, String extension, Set<String> visited) {
if (dir.isDirectory()) {
- File[] children = dir.listFiles();
- for (int i = 0; i < children.length; i++) {
- findFiles(base, children[i], extension, visited);
+ for (File element : dir.listFiles()) {
+ findFiles(base, element, extension, visited);
}
} else if (dir.getAbsolutePath().endsWith(extension)) {
// remove base directory
@@ -259,8 +248,7 @@
List<String> visited = new ArrayList<>();
List<String> exited = new ArrayList<>();
- for (Iterator<String> iter = srcdir2sourcedirs.keySet().iterator(); iter.hasNext();) {
- String srcdir = iter.next();
+ for (String srcdir : srcdir2sourcedirs.keySet()) {
if (!visited.contains(srcdir)) {
if (circleSearch(srcdir, srcdir2sourcedirs, visited, exited, cycle)) {
return false;
@@ -276,8 +264,7 @@
cycle.add(srcdir);
Set<String> sourcedirs = srcdir2sourcedirs.get(srcdir);
if (sourcedirs != null) {
- for (Iterator<String> iter = sourcedirs.iterator(); iter.hasNext();) {
- String src = iter.next();
+ for (String src : sourcedirs) {
if (!visited.contains(src)) {
res = circleSearch(src, srcdir2sourcedirs, visited, exited, cycle);
} else if (!exited.contains(src)) {
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetOrderDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetOrderDialog.java
index ea7f8ae..a6d1736 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetOrderDialog.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/TargetOrderDialog.java
@@ -188,8 +188,7 @@
private List<AntTargetNode> getOrderedSelection() {
List<AntTargetNode> targets = new ArrayList<>();
List<?> selection = ((IStructuredSelection) fViewer.getSelection()).toList();
- for (int i = 0; i < fTargets.length; i++) {
- AntTargetNode target = fTargets[i];
+ for (AntTargetNode target : fTargets) {
if (selection.contains(target)) {
targets.add(target);
}
@@ -239,11 +238,11 @@
int last = fTargets.length - 1;
boolean up = true && selections.length > 0;
boolean down = true && selections.length > 0;
- for (int i = 0; i < selections.length; i++) {
- if (selections[i] == 0) {
+ for (int selection : selections) {
+ if (selection == 0) {
up = false;
}
- if (selections[i] == last) {
+ if (selection == last) {
down = false;
}
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java
index 242307f..26daa30 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java
@@ -50,9 +50,8 @@
protected void layout(Composite composite, boolean flushCache) {
Rectangle rect = composite.getClientArea();
- Control[] children = composite.getChildren();
- for (int i = 0; i < children.length; i++) {
- children[i].setBounds(rect);
+ for (Control element : composite.getChildren()) {
+ element.setBounds(rect);
}
}
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java
index 0c7a74d..c052688 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java
@@ -62,9 +62,8 @@
final Set<AntProjectNode> projects = getSelectedProjects();
if (projects.isEmpty()) {
// If no selection, add all
- AntProjectNode[] allProjects = fView.getProjects();
- for (int i = 0; i < allProjects.length; i++) {
- projects.add(allProjects[i]);
+ for (AntProjectNode antproject : fView.getProjects()) {
+ projects.add(antproject);
}
}
final Iterator<AntProjectNode> iter = projects.iterator();
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java
index fe40b32..681c64d 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java
@@ -80,8 +80,7 @@
* Returns whether or not the given build file already exists in the ant view.
*/
private boolean alreadyAdded(String buildFileName) {
- for (int j = 0; j < existingProjects.length; j++) {
- AntProjectNode existingProject = existingProjects[j];
+ for (AntProjectNode existingProject : existingProjects) {
if (existingProject.getBuildFileName().equals(buildFileName)) {
return true;
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java
index dff851e..37ef64a 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesDialog.java
@@ -307,12 +307,10 @@
validateInput();
return;
}
- IAdaptable[] elements = set.getElements();
searchScopes = new ArrayList<>();
- for (int i = 0; i < elements.length; i++) {
+ for (IAdaptable adaptable : set.getElements()) {
// Try to get an IResource object from each element
IResource resource = null;
- IAdaptable adaptable = elements[i];
if (adaptable instanceof IResource) {
resource = (IResource) adaptable;
} else {
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
index 9008b54..41ff6d2 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/SiteEntry.java
@@ -136,10 +136,9 @@
if (policy.getType() == ISitePolicy.USER_EXCLUDE) {
ArrayList<String> detectedPlugins = new ArrayList<>(Arrays.asList(getDetectedPlugins()));
- String[] excludedPlugins = policy.getList();
- for (int i = 0; i < excludedPlugins.length; i++) {
- if (detectedPlugins.contains(excludedPlugins[i]))
- detectedPlugins.remove(excludedPlugins[i]);
+ for (String excludedPlugin : policy.getList()) {
+ if (detectedPlugins.contains(excludedPlugin))
+ detectedPlugins.remove(excludedPlugin);
}
return detectedPlugins.toArray(new String[0]);
}
@@ -169,21 +168,18 @@
// cache all the plugin entries for faster lookup later
Map<VersionedIdentifier, PluginEntry> cachedPlugins = new HashMap<>(pluginEntries.size());
- for (int i=0; i<pluginEntries.size(); i++) {
- PluginEntry p = pluginEntries.get(i);
+ for (PluginEntry p : pluginEntries) {
cachedPlugins.put(p.getVersionedIdentifier(), p);
}
ArrayList<PluginEntry> managedPlugins = new ArrayList<>();
- for (Iterator<IFeatureEntry> iterator=featureEntries.values().iterator(); iterator.hasNext();) {
- IFeatureEntry feature = iterator.next();
+ for (IFeatureEntry feature : featureEntries.values()) {
if (!(feature instanceof FeatureEntry))
continue;
- PluginEntry[] plugins = ((FeatureEntry)feature).getPluginEntries();
- for (int i=0; i<plugins.length; i++)
- if (cachedPlugins.containsKey(plugins[i].getVersionedIdentifier()))
- managedPlugins.add(cachedPlugins.get(plugins[i].getVersionedIdentifier()));
+ for (PluginEntry plugin : ((FeatureEntry)feature).getPluginEntries())
+ if (cachedPlugins.containsKey(plugin.getVersionedIdentifier()))
+ managedPlugins.add(cachedPlugins.get(plugin.getVersionedIdentifier()));
}
return managedPlugins.toArray(new PluginEntry[managedPlugins.size()]);
@@ -193,8 +189,8 @@
String[] pluginURLs = getPlugins();
// hash the array, for faster lookups
HashMap<String, String> map = new HashMap<>(pluginURLs.length);
- for (int i=0; i<pluginURLs.length; i++)
- map.put(pluginURLs[i], pluginURLs[i]);
+ for (String pluginURL : pluginURLs)
+ map.put(pluginURL, pluginURL);
if (pluginEntries == null)
detectPlugins();
@@ -276,11 +272,11 @@
return valid;
});
- for (int index = 0; index < dirs.length; index++) {
+ for (File dir : dirs) {
try {
- File featureXML = new File(dirs[index], FEATURE_XML);
+ File featureXML = new File(dir, FEATURE_XML);
if (featureXML.lastModified() <= featuresChangeStamp &&
- dirs[index].lastModified() <= featuresChangeStamp)
+ dir.lastModified() <= featuresChangeStamp)
continue;
URL featureURL = featureXML.toURL();
FeatureEntry featureEntry = featureParser.parse(featureURL);
@@ -314,12 +310,11 @@
File pluginsDir = new File(resolvedURL.getFile(), PLUGINS);
if (pluginsDir.exists() && pluginsDir.isDirectory()) {
- File[] files = pluginsDir.listFiles();
- for (int i = 0; i < files.length; i++) {
- if(files[i].isDirectory()){
- detectUnpackedPlugin(files[i], compareTimeStamps);
- }else if(files[i].getName().endsWith(".jar")){ //$NON-NLS-1$
- detectPackedPlugin(files[i], compareTimeStamps);
+ for (File file : pluginsDir.listFiles()) {
+ if(file.isDirectory()){
+ detectUnpackedPlugin(file, compareTimeStamps);
+ }else if(file.getName().endsWith(".jar")){ //$NON-NLS-1$
+ detectPackedPlugin(file, compareTimeStamps);
}else{
// not bundle file
}
@@ -526,16 +521,16 @@
// code executes early on the startup sequence we need to be
// extremely mindful of performance issues.
// In fact, we should get the last modified from the connection
- for (int i = 0; i < targets.length; i++)
- result ^= targets[i].hashCode();
+ for (String target : targets)
+ result ^= target.hashCode();
Utils.debug("*WARNING* computing stamp using URL hashcodes only"); //$NON-NLS-1$
} else {
// compute stamp across local targets
File rootFile = new File(resolvedURL.getFile().replace('/', File.separatorChar));
if (rootFile.exists()) {
File f = null;
- for (int i = 0; i < targets.length; i++) {
- f = new File(rootFile, targets[i]);
+ for (String target : targets) {
+ f = new File(rootFile, target);
if (f.exists())
result = Math.max(result, f.lastModified());
}
@@ -667,9 +662,8 @@
// collect feature entries
// configElement.setAttribute(CFG_FEATURE_ENTRY_DEFAULT, defaultFeature);
- FeatureEntry[] feats = getFeatureEntries();
- for (int i = 0; i < feats.length; i++) {
- Element featureElement = feats[i].toXML(doc);
+ for (FeatureEntry feat : getFeatureEntries()) {
+ Element featureElement = feat.toXML(doc);
siteElement.appendChild(featureElement);
}
@@ -688,24 +682,23 @@
if (!featureXML.exists())
deletedFeatures.add(feature.getFeatureIdentifier());
}
- for(Iterator<String> it=deletedFeatures.iterator(); it.hasNext();){
- featureEntries.remove(it.next());
+ for (String string : deletedFeatures) {
+ featureEntries.remove(string);
}
}
private void validatePluginEntries() {
File root = new File(resolvedURL.getFile().replace('/', File.separatorChar));
Collection<PluginEntry> deletedPlugins = new ArrayList<>();
- for (int i=0; i<pluginEntries.size(); i++) {
- PluginEntry plugin = pluginEntries.get(i);
+ for (PluginEntry plugin : pluginEntries) {
// Note: in the future, we can check for absolute url as well.
// For now, feature url is plugins/org.eclipse.foo/plugin.xml
File pluginLocation = new File(root, plugin.getURL());
if (!pluginLocation.exists())
deletedPlugins.add(plugin);
}
- for(Iterator<PluginEntry> it=deletedPlugins.iterator(); it.hasNext();){
- pluginEntries.remove(it.next());
+ for (PluginEntry pluginEntry : deletedPlugins) {
+ pluginEntries.remove(pluginEntry);
}
}
@@ -718,10 +711,9 @@
}
public FeatureEntry getFeatureEntry(String id) {
- FeatureEntry[] features = getFeatureEntries();
- for (int i=0; i<features.length; i++)
- if (features[i].getFeatureIdentifier().equals(id))
- return features[i];
+ for (FeatureEntry feature : getFeatureEntries())
+ if (feature.getFeatureIdentifier().equals(id))
+ return feature;
return null;
}
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java
index 12da041..b3e5fcd 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Utils.java
@@ -224,9 +224,9 @@
if (bundles == null)
return null;
//Return the first bundle that is not installed or uninstalled
- for (int i = 0; i < bundles.length; i++) {
- if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
- return bundles[i];
+ for (Bundle bundle : bundles) {
+ if ((bundle.getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
+ return bundle;
}
}
return null;
