[214656] Java 5 for loop
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
index eb0cf97..30553a9 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
@@ -45,16 +45,14 @@
public void registryChanged(IRegistryChangeEvent event) {
IExtensionDelta[] deltas = event.getExtensionDeltas(ServerPlugin.PLUGIN_ID, EXTENSION_RUNTIME_TYPE);
if (deltas != null) {
- for (int i = 0; i < deltas.length; i++) {
- handleRuntimeTypeDelta(deltas[i]);
- }
+ for (IExtensionDelta delta : deltas)
+ handleRuntimeTypeDelta(delta);
}
deltas = event.getExtensionDeltas(ServerPlugin.PLUGIN_ID, EXTENSION_SERVER_TYPE);
if (deltas != null) {
- for (int i = 0; i < deltas.length; i++) {
- handleServerTypeDelta(deltas[i]);
- }
+ for (IExtensionDelta delta : deltas)
+ handleServerTypeDelta(delta);
}
}
}
@@ -202,12 +200,12 @@
* Load the runtime types.
*/
private static synchronized void addRuntimeTypes(IConfigurationElement[] cf, List<IRuntimeType> list) {
- for (int i = 0; i < cf.length; i++) {
+ for (IConfigurationElement ce : cf) {
try {
- list.add(new RuntimeType(cf[i]));
- Trace.trace(Trace.EXTENSION_POINT, " Loaded runtimeType: " + cf[i].getAttribute("id"));
+ list.add(new RuntimeType(ce));
+ Trace.trace(Trace.EXTENSION_POINT, " Loaded runtimeType: " + ce.getAttribute("id"));
} catch (Throwable t) {
- Trace.trace(Trace.SEVERE, " Could not load runtimeType: " + cf[i].getAttribute("id"), t);
+ Trace.trace(Trace.SEVERE, " Could not load runtimeType: " + ce.getAttribute("id"), t);
}
}
}
@@ -235,12 +233,12 @@
* Load the server types.
*/
private static synchronized void addServerTypes(IConfigurationElement[] cf, List<IServerType> list) {
- for (int i = 0; i < cf.length; i++) {
+ for (IConfigurationElement ce : cf) {
try {
- list.add(new ServerType(cf[i]));
- Trace.trace(Trace.EXTENSION_POINT, " Loaded serverType: " + cf[i].getAttribute("id"));
+ list.add(new ServerType(ce));
+ Trace.trace(Trace.EXTENSION_POINT, " Loaded serverType: " + ce.getAttribute("id"));
} catch (Throwable t) {
- Trace.trace(Trace.SEVERE, " Could not load serverType: " + cf[i].getAttribute("id"), t);
+ Trace.trace(Trace.SEVERE, " Could not load serverType: " + ce.getAttribute("id"), t);
}
}
}
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
index 227f3ea..060c358 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
@@ -92,14 +92,12 @@
ModuleFactory[] factories = ServerPlugin.getModuleFactories();
if (factories != null) {
- int size = factories.length;
- for (int i = 0; i < size; i++) {
- IModule[] modules = factories[i].getModules(project, null);
+ for (ModuleFactory factory : factories) {
+ IModule[] modules = factory.getModules(project, null);
if (modules != null) {
- int size2 = modules.length;
- for (int j = 0; j < size2; j++) {
- if (!set.contains(modules[j]))
- set.add(modules[j]);
+ for (IModule module : modules) {
+ if (!set.contains(module))
+ set.add(module);
}
}
}
@@ -155,14 +153,12 @@
ModuleFactory[] factories = ServerPlugin.getModuleFactories();
if (factories != null) {
- int size = factories.length;
- for (int i = 0; i < size; i++) {
- if (isSupportedModule(factories[i].getModuleTypes(), moduleTypes)) {
- IModule[] modules = factories[i].getModules(null);
+ for (ModuleFactory factory : factories) {
+ if (isSupportedModule(factory.getModuleTypes(), moduleTypes)) {
+ IModule[] modules = factory.getModules(null);
if (modules != null) {
- int size2 = modules.length;
- for (int j = 0; j < size2; j++)
- list.add(modules[j]);
+ for (IModule module : modules)
+ list.add(module);
}
}
}
@@ -190,15 +186,13 @@
ModuleFactory[] factories = ServerPlugin.getModuleFactories();
if (factories != null) {
- int size = factories.length;
- for (int i = 0; i < size; i++) {
- if (isSupportedModule(factories[i].getModuleTypes(), type, null)) {
- IModule[] modules = factories[i].getModules(null);
+ for (ModuleFactory factory : factories) {
+ if (isSupportedModule(factory.getModuleTypes(), type, null)) {
+ IModule[] modules = factory.getModules(null);
if (modules != null) {
- int size2 = modules.length;
- for (int j = 0; j < size2; j++)
- if (type.equals(modules[j].getModuleType().getId()))
- list.add(modules[j]);
+ for (IModule module : modules)
+ if (type.equals(module.getModuleType().getId()))
+ list.add(module);
}
}
}
@@ -230,9 +224,8 @@
if (typeId == null && versionId == null)
return true;
- int size = moduleTypes.length;
- for (int i = 0; i < size; i++) {
- if (isSupportedModule(moduleTypes[i], typeId, versionId))
+ for (IModuleType moduleType : moduleTypes) {
+ if (isSupportedModule(moduleType, typeId, versionId))
return true;
}
@@ -241,9 +234,8 @@
private static boolean isSupportedModule(IModuleType[] moduleTypes, IModuleType[] mt) {
if (mt != null) {
- int size = mt.length;
- for (int i = 0; i < size; i++) {
- if (isSupportedModule(moduleTypes, mt[i]))
+ for (IModuleType moduleType : mt) {
+ if (isSupportedModule(moduleTypes, moduleType))
return true;
}
}
@@ -263,9 +255,8 @@
if (moduleTypes == null || mt == null)
throw new IllegalArgumentException();
- int size = moduleTypes.length;
- for (int i = 0; i < size; i++) {
- if (isSupportedModule(moduleTypes[i], mt))
+ for (IModuleType moduleType : moduleTypes) {
+ if (isSupportedModule(moduleType, mt))
return true;
}
return false;
@@ -331,17 +322,16 @@
if (remove == null)
remove = new IModule[0];
- int size = add.length;
- for (int i = 0; i < size; i++) {
- if (add[i] == null)
+ for (IModule module : add) {
+ if (module == null)
throw new IllegalArgumentException("Cannot add null entries");
}
List<IModule> addParentModules = new ArrayList<IModule>();
- for (int i = 0; i < size; i++) {
+ for (IModule module : add) {
boolean found = false;
try {
- IModule[] parents = server.getRootModules(add[i], monitor);
+ IModule[] parents = server.getRootModules(module, monitor);
if (parents != null && parents.length > 0) {
IModule parent = parents[0];
found = true;
@@ -353,20 +343,19 @@
}
if (!found)
- addParentModules.add(add[i]);
+ addParentModules.add(module);
}
- size = remove.length;
- for (int i = 0; i < size; i++) {
- if (remove[i] == null)
+ for (IModule module : remove) {
+ if (module == null)
throw new IllegalArgumentException("Cannot remove null entries");
}
List<IModule> removeParentModules = new ArrayList<IModule>();
- for (int i = 0; i < size; i++) {
+ for (IModule module : remove) {
boolean found = false;
try {
- IModule[] parents = server.getRootModules(remove[i], monitor);
+ IModule[] parents = server.getRootModules(module, monitor);
if (parents != null && parents.length > 0) {
IModule parent = parents[0];
found = true;
@@ -378,7 +367,7 @@
}
if (!found)
- removeParentModules.add(remove[i]);
+ removeParentModules.add(module);
}
IModule[] add2 = new IModule[addParentModules.size()];
@@ -540,11 +529,10 @@
List<IRuntime> list = new ArrayList<IRuntime>();
IRuntime[] runtimes = ServerCore.getRuntimes();
if (runtimes != null) {
- int size = runtimes.length;
- for (int i = 0; i < size; i++) {
- IRuntimeType runtimeType = runtimes[i].getRuntimeType();
+ for (IRuntime runtime : runtimes) {
+ IRuntimeType runtimeType = runtime.getRuntimeType();
if (runtimeType != null && isSupportedModule(runtimeType.getModuleTypes(), type, version)) {
- list.add(runtimes[i]);
+ list.add(runtime);
}
}
}
@@ -566,10 +554,9 @@
List<IRuntimeType> list = new ArrayList<IRuntimeType>();
IRuntimeType[] runtimeTypes = ServerCore.getRuntimeTypes();
if (runtimeTypes != null) {
- int size = runtimeTypes.length;
- for (int i = 0; i < size; i++) {
- if (isSupportedModule(runtimeTypes[i].getModuleTypes(), type, version)) {
- list.add(runtimeTypes[i]);
+ for (IRuntimeType runtimeType : runtimeTypes) {
+ if (isSupportedModule(runtimeType.getModuleTypes(), type, version)) {
+ list.add(runtimeType);
}
}
}
@@ -593,11 +580,10 @@
List<IRuntimeType> list = new ArrayList<IRuntimeType>();
IRuntimeType[] runtimeTypes = ServerCore.getRuntimeTypes();
if (runtimeTypes != null) {
- int size = runtimeTypes.length;
- for (int i = 0; i < size; i++) {
- if (isSupportedModule(runtimeTypes[i].getModuleTypes(), type, version)) {
- if (runtimeTypeId == null || runtimeTypes[i].getId().startsWith(runtimeTypeId))
- list.add(runtimeTypes[i]);
+ for (IRuntimeType runtimeType : runtimeTypes) {
+ if (isSupportedModule(runtimeType.getModuleTypes(), type, version)) {
+ if (runtimeTypeId == null || runtimeType.getId().startsWith(runtimeTypeId))
+ list.add(runtimeType);
}
}
}
@@ -608,10 +594,10 @@
}
/**
- * Returns a list of all servers that this deployable is not currently
+ * Returns a list of all servers that this module is not currently
* configured on, but could be added to. If includeErrors is true, this
- * method return servers where the parent deployable may throw errors. For
- * instance, this deployable may be the wrong spec level.
+ * method return servers where the parent module may throw errors. For
+ * instance, this module may be the wrong spec level.
*
* @param module a module
* @param includeErrors <code>true</code> to include servers that returned
@@ -630,26 +616,25 @@
List<IServer> list = new ArrayList<IServer>();
IServer[] servers = ServerCore.getServers();
if (servers != null) {
- int size = servers.length;
- for (int i = 0; i < size; i++) {
- if (!containsModule(servers[i], module, monitor)) {
+ for (IServer server : servers) {
+ if (!containsModule(server, module, monitor)) {
try {
- IModule[] parents = servers[i].getRootModules(module, monitor);
+ IModule[] parents = server.getRootModules(module, monitor);
if (parents != null && parents.length > 0) {
boolean found = false;
int size2 = parents.length;
for (int j = 0; !found && j < size2; j++) {
IModule parent = parents[j];
- IStatus status = servers[i].canModifyModules(new IModule[] { parent }, new IModule[0], monitor);
+ IStatus status = server.canModifyModules(new IModule[] { parent }, new IModule[0], monitor);
if (status == null || status.isOK()){
- list.add(servers[i]);
+ list.add(server);
found = true;
}
}
}
} catch (Exception se) {
if (includeErrors)
- list.add(servers[i]);
+ list.add(server);
}
}
}
@@ -684,10 +669,9 @@
List<IServer> list = new ArrayList<IServer>();
IServer[] servers = ServerCore.getServers();
if (servers != null) {
- int size = servers.length;
- for (int i = 0; i < size; i++) {
- if (containsModule(servers[i], module, monitor))
- list.add(servers[i]);
+ for (IServer server : servers) {
+ if (containsModule(server, module, monitor))
+ list.add(server);
}
}
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Base.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Base.java
index 930b1c3..4328094 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Base.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Base.java
@@ -281,16 +281,13 @@
}
IMemento[] children = memento.getChildren("list");
if (children != null) {
- int size = children.length;
- for (int i = 0; i < size; i++) {
- loadList(children[i]);
- }
+ for (IMemento child : children)
+ loadList(child);
}
IMemento[] maps = memento.getChildren("map");
if (maps != null) {
- for (int i = 0; i <maps.length ; i++) {
- loadMap(maps[i]);
- }
+ for (IMemento m : maps)
+ loadMap(m);
}
loadState(memento);
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetMappingUtil.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetMappingUtil.java
index ef408c7..019784c 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetMappingUtil.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetMappingUtil.java
@@ -84,27 +84,25 @@
IConfigurationElement[] cf = registry.getConfigurationElementsFor(ServerPlugin.PLUGIN_ID, "runtimeFacetComponentProviders");
// load new wst extension point
- int size = cf.length;
- List<RuntimeComponentProviderWrapper> list = new ArrayList<RuntimeComponentProviderWrapper>(size);
- for (int i = 0; i < size; i++) {
+ List<RuntimeComponentProviderWrapper> list = new ArrayList<RuntimeComponentProviderWrapper>(cf.length);
+ for (IConfigurationElement ce : cf) {
try {
- list.add(new RuntimeComponentProviderWrapper(cf[i]));
- Trace.trace(Trace.CONFIG, " Loaded runtimeFacetComponentProvider: " + cf[i].getAttribute("id"));
+ list.add(new RuntimeComponentProviderWrapper(ce));
+ Trace.trace(Trace.CONFIG, " Loaded runtimeFacetComponentProvider: " + ce.getAttribute("id"));
} catch (Throwable t) {
- Trace.trace(Trace.SEVERE, " Could not load runtimeFacetComponentProvider: " + cf[i].getAttribute("id"), t);
+ Trace.trace(Trace.SEVERE, " Could not load runtimeFacetComponentProvider: " + ce.getAttribute("id"), t);
}
}
// load old jst extension point
cf = registry.getConfigurationElementsFor("org.eclipse.jst.server.core.internalRuntimeComponentProviders");
- size = cf.length;
- for (int i = 0; i < size; i++) {
+ for (IConfigurationElement ce : cf) {
try {
- list.add(new RuntimeComponentProviderWrapper(cf[i]));
- Trace.trace(Trace.CONFIG, " Loaded runtimeFacetComponentProvider: " + cf[i].getAttribute("id"));
+ list.add(new RuntimeComponentProviderWrapper(ce));
+ Trace.trace(Trace.CONFIG, " Loaded runtimeFacetComponentProvider: " + ce.getAttribute("id"));
} catch (Throwable t) {
- Trace.trace(Trace.SEVERE, " Could not load runtimeFacetComponentProvider: " + cf[i].getAttribute("id"), t);
+ Trace.trace(Trace.SEVERE, " Could not load runtimeFacetComponentProvider: " + ce.getAttribute("id"), t);
}
}
runtimeComponentProviders = list;
@@ -122,14 +120,13 @@
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] cf = registry.getConfigurationElementsFor("org.eclipse.jst.server.core.runtimeFacetMappings");
- int size = cf.length;
- List<RuntimeFacetMapping> list = new ArrayList<RuntimeFacetMapping>(size);
- for (int i = 0; i < size; i++) {
+ List<RuntimeFacetMapping> list = new ArrayList<RuntimeFacetMapping>(cf.length);
+ for (IConfigurationElement ce : cf) {
try {
- list.add(new RuntimeFacetMapping(cf[i]));
- Trace.trace(Trace.CONFIG, " Loaded runtimeFacetMapping: " + cf[i].getAttribute("runtimeTypeId"));
+ list.add(new RuntimeFacetMapping(ce));
+ Trace.trace(Trace.CONFIG, " Loaded runtimeFacetMapping: " + ce.getAttribute("runtimeTypeId"));
} catch (Throwable t) {
- Trace.trace(Trace.SEVERE, " Could not load runtimeFacetMapping: " + cf[i].getAttribute("id"), t);
+ Trace.trace(Trace.SEVERE, " Could not load runtimeFacetMapping: " + ce.getAttribute("id"), t);
}
}
runtimeFacetMappings = list;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetUtil.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetUtil.java
index dcd41e2..f2cc6bf 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetUtil.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetUtil.java
@@ -68,10 +68,9 @@
return null;
IRuntime[] runtimes = ServerCore.getRuntimes();
- int size = runtimes.length;
- for (int i = 0; i < size; i++) {
- if (id.equals(runtimes[i].getId()))
- return runtimes[i];
+ for (IRuntime r : runtimes) {
+ if (id.equals(r.getId()))
+ return r;
}
return null;
@@ -153,9 +152,8 @@
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
if (projects != null) {
- int size = projects.length;
- for (int i = 0; i < size; i++) {
- IFacetedProject facetedProject = ProjectFacetsManager.create(projects[i]);
+ for (IProject project : projects) {
+ IFacetedProject facetedProject = ProjectFacetsManager.create(project);
if (facetedProject != null) {
Set<org.eclipse.wst.common.project.facet.core.runtime.IRuntime> set = facetedProject.getTargetedRuntimes();
if (set != null && set.contains(runtime2))
@@ -183,9 +181,8 @@
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
if (projects != null) {
- int size = projects.length;
- for (int i = 0; i < size; i++) {
- IFacetedProject facetedProject = ProjectFacetsManager.create(projects[i]);
+ for (IProject project : projects) {
+ IFacetedProject facetedProject = ProjectFacetsManager.create(project);
if (facetedProject != null) {
Set<org.eclipse.wst.common.project.facet.core.runtime.IRuntime> set = facetedProject.getTargetedRuntimes();
if (set != null && set.contains(runtime2))
