Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Hammer2019-11-20 19:06:40 +0000
committerAlexander Kurtakov2019-12-11 16:31:23 +0000
commit64699225ab687e88a61212c7f17f0eb56c9cad21 (patch)
tree0294e9267ceb6b2f78c55303af4cff293f588d0e
parent10ae1613f5f13a85ab86a52b7259c42d0cd41eca (diff)
downloadrt.equinox.p2-64699225ab687e88a61212c7f17f0eb56c9cad21.tar.gz
rt.equinox.p2-64699225ab687e88a61212c7f17f0eb56c9cad21.tar.xz
rt.equinox.p2-64699225ab687e88a61212c7f17f0eb56c9cad21.zip
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: Ib3c0999b46708124b57b905f58b7317957e83534 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java14
-rw-r--r--bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Phase.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/PhaseSet.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/ProxiesDialog.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Pipe.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RecreateRepositoryApplication.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java19
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java18
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java5
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java7
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java16
21 files changed, 62 insertions, 80 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
index 978debf7f..a226aad91 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
@@ -233,14 +233,13 @@ public class Projector {
}
List<IInstallableUnit> iusToOrder = new ArrayList<>(queryResult.toSet());
Collections.sort(iusToOrder);
- for (Iterator<IInstallableUnit> iusToEncode = iusToOrder.iterator(); iusToEncode.hasNext();) {
+ for (IInstallableUnit iu : iusToOrder) {
if (monitor.isCanceled()) {
result.merge(Status.CANCEL_STATUS);
throw new OperationCanceledException();
}
- IInstallableUnit iuToEncode = iusToEncode.next();
- if (iuToEncode != entryPointIU) {
- processIU(iuToEncode, false);
+ if (iu != entryPointIU) {
+ processIU(iu, false);
}
}
createMustHave(entryPointIU, alreadyExistingRoots);
@@ -515,8 +514,8 @@ public class Projector {
Collection<IRequirement> iuRequirements = getRequiredCapabilities(iu);
Map<IRequirement, List<IInstallableUnitPatch>> unchangedRequirements = new HashMap<>(iuRequirements.size());
Map<IRequirement, Pending> nonPatchedRequirements = new HashMap<>(iuRequirements.size());
- for (Iterator<IInstallableUnit> iterator = applicablePatches.iterator(); iterator.hasNext();) {
- IInstallableUnitPatch patch = (IInstallableUnitPatch) iterator.next();
+ for (IInstallableUnit iup : applicablePatches) {
+ IInstallableUnitPatch patch = (IInstallableUnitPatch) iup;
IRequirement[][] reqs = mergeRequirements(iu, patch);
if (reqs.length == 0)
return;
@@ -826,8 +825,7 @@ public class Projector {
IRequirement[] originalRequirements = iuRequirements.toArray(new IRequirement[iuRequirements.size()]);
List<IRequirement[]> rrr = new ArrayList<>();
boolean found = false;
- for (int i = 0; i < changes.size(); i++) {
- IRequirementChange change = changes.get(i);
+ for (IRequirementChange change : changes) {
for (int j = 0; j < originalRequirements.length; j++) {
if (originalRequirements[j] != null && safeMatch(originalRequirements, change, j)) {
found = true;
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java
index 3b9998200..c369fb8b0 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java
@@ -265,8 +265,7 @@ public class RepositoryListener extends DirectoryChangeListener {
currentFiles.clear();
if (metadataRepository != null) {
IQueryResult<IInstallableUnit> ius = metadataRepository.query(QueryUtil.createIUAnyQuery(), null);
- for (Iterator<IInstallableUnit> it = ius.iterator(); it.hasNext();) {
- IInstallableUnit iu = it.next();
+ for (IInstallableUnit iu : ius) {
String filename = iu.getProperty(FILE_NAME);
if (filename == null) {
if (Tracing.DEBUG) {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Phase.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Phase.java
index 0071a1d62..189a295c2 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Phase.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Phase.java
@@ -164,8 +164,7 @@ public abstract class Phase {
if (actions != null) {
Object lastResult = null;
- for (int j = 0; j < actions.size(); j++) {
- ProvisioningAction action = actions.get(j);
+ for (ProvisioningAction action : actions) {
Map<String, Object> parameters = operandParameters;
Touchpoint touchpoint = action.getTouchpoint();
if (touchpoint != null) {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/PhaseSet.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/PhaseSet.java
index 88a289f7b..71d68e852 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/PhaseSet.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/PhaseSet.java
@@ -115,8 +115,7 @@ public class PhaseSet implements IPhaseSet {
List<ProvisioningAction> actions = phase.getActions(operand);
if (actions == null)
continue;
- for (int k = 0; k < actions.size(); k++) {
- ProvisioningAction action = actions.get(k);
+ for (ProvisioningAction action : actions) {
if (action instanceof MissingAction)
missingActions.add((MissingAction) action);
}
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/ProxiesDialog.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/ProxiesDialog.java
index 153d71465..2eb3a91ca 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/ProxiesDialog.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/ProxiesDialog.java
@@ -107,8 +107,8 @@ public final class ProxiesDialog {
typeCombo = new Combo(composite, SWT.BORDER);
typeCombo.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 3, 1));
//Currently only these three proxy types are supported.
- for (int i = 0; i < types.size(); i++) {
- typeCombo.add(types.get(i));
+ for (String type : types) {
+ typeCombo.add(type);
}
typeCombo.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Pipe.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Pipe.java
index f718c17de..d4394c25e 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Pipe.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Pipe.java
@@ -76,8 +76,7 @@ public class Pipe extends NAry {
ArrayList<Expression> pipeables = new ArrayList<>();
ArrayList<Expression> booleans = new ArrayList<>();
VariableFinder finder = new VariableFinder(ExpressionFactory.EVERYTHING);
- for (int idx = 0; idx < operands.length; ++idx) {
- Expression operand = operands[idx];
+ for (Expression operand : operands) {
finder.reset();
operand.accept(finder);
if (finder.isFound()) {
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
index 6145cdb81..733c9ce6e 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
@@ -322,8 +322,8 @@ public class RequestFlexer {
SubMonitor subMonitor = SubMonitor.convert(monitor, 1);
Collection<IInstallableUnit> availableUpdates = new HashSet<>();
IQueryResult<IInstallableUnit> updatesAvailable = planner.updatesFor(iu, provisioningContext, subMonitor.split(1));
- for (Iterator<IInstallableUnit> iterator = updatesAvailable.iterator(); iterator.hasNext();) {
- availableUpdates.add(iterator.next());
+ for (IInstallableUnit unit : updatesAvailable) {
+ availableUpdates.add(unit);
}
return availableUpdates;
}
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
index 5a4b64cf6..60fa77a44 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
@@ -257,8 +257,8 @@ public class PlatformXmlListener extends DirectoryChangeListener {
}
}
if (!toBeRemoved.isEmpty()) {
- for (Iterator<Site> iter = toBeRemoved.iterator(); iter.hasNext();)
- config.removeSite(iter.next());
+ for (Site site : toBeRemoved)
+ config.removeSite(site);
try {
config.save(root, Activator.getOSGiInstallArea());
} catch (ProvisionException e) {
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RecreateRepositoryApplication.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RecreateRepositoryApplication.java
index 43720af14..59555f69f 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RecreateRepositoryApplication.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/RecreateRepositoryApplication.java
@@ -77,8 +77,7 @@ public class RecreateRepositoryApplication extends AbstractApplication {
repoMap = new HashMap<>();
IQueryResult<IArtifactKey> keys = repository.query(ArtifactKeyQuery.ALL_KEYS, null);
- for (Iterator<IArtifactKey> iterator = keys.iterator(); iterator.hasNext();) {
- IArtifactKey key = iterator.next();
+ for (IArtifactKey key : keys) {
IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);
repoMap.put(key, descriptors);
}
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java
index edc10ed95..397cb4b05 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/Repo2Runnable.java
@@ -150,8 +150,8 @@ public class Repo2Runnable extends AbstractApplication implements IApplication {
context.setMetadataRepositories(getRepositories(true));
context.setArtifactRepositories(getRepositories(false));
IProvisioningPlan plan = engine.createPlan(profile, context);
- for (Iterator<IInstallableUnit> iterator = processedIUs.iterator(); iterator.hasNext();) {
- plan.addInstallableUnit(iterator.next());
+ for (IInstallableUnit iu : processedIUs) {
+ plan.addInstallableUnit(iu);
}
IStatus result = engine.perform(plan, getPhaseSet(), progress.newChild(1));
PhaseSet nativeSet = getNativePhase();
@@ -170,21 +170,20 @@ public class Repo2Runnable extends AbstractApplication implements IApplication {
File fragmentInfo = new File(parentDir, "fragment.info");
HashSet<BundleInfo> bundles = new HashSet<>();
try {
- for (Iterator<IInstallableUnit> iterator = processedIUs.iterator(); iterator.hasNext();) {
- IInstallableUnit unit = iterator.next();
- if (unit.getId().equals("a.jre"))
+ for (IInstallableUnit iu : processedIUs) {
+ if (iu.getId().equals("a.jre"))
continue;
- Collection<IProvidedCapability> providedCapabilities = unit.getProvidedCapabilities();
+ Collection<IProvidedCapability> providedCapabilities = iu.getProvidedCapabilities();
for (IProvidedCapability cap : providedCapabilities) {
if ("org.eclipse.equinox.p2.eclipse.type".equals(cap.getNamespace())) {
if ("bundle".equals(cap.getName())) {
- File candidate = new File(pluginsDir, unit.getId() + "_" + unit.getVersion());
+ File candidate = new File(pluginsDir, iu.getId() + "_" + iu.getVersion());
if (candidate.exists()) {
- bundles.add(new BundleInfo(unit.getId(), unit.getVersion().toString(), candidate.toURI(), 4, false));
+ bundles.add(new BundleInfo(iu.getId(), iu.getVersion().toString(), candidate.toURI(), 4, false));
}
- candidate = new File(pluginsDir, unit.getId() + "_" + unit.getVersion() + ".jar");
+ candidate = new File(pluginsDir, iu.getId() + "_" + iu.getVersion() + ".jar");
if (candidate.exists()) {
- bundles.add(new BundleInfo(unit.getId(), unit.getVersion().toString(), candidate.toURI(), 4, false));
+ bundles.add(new BundleInfo(iu.getId(), iu.getVersion().toString(), candidate.toURI(), 4, false));
}
break;
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java
index 4d0d6a5d3..298ab4517 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ReducedCUDFParser.java
@@ -150,8 +150,8 @@ public class ReducedCUDFParser {
if (TIMING)
// Log.println("Time to parse:" + (System.currentTimeMillis() - start));
if (DEBUG)
- for (Iterator<IInstallableUnit> iter = allIUs.iterator(); iter.hasNext();)
- debug((InstallableUnit) iter.next());
+ for (IInstallableUnit iu : allIUs)
+ debug((InstallableUnit) iu);
// if (FORCE_QUERY) {
// if (query == null)
// initializeQueryableArray();
@@ -540,8 +540,8 @@ public class ReducedCUDFParser {
List<Tuple> pkgs = createPackageList(line);
IProvidedCapability[] providedCapabilities = new ProvidedCapability[pkgs.size() + 2];
int i = 0;
- for (Iterator<Tuple> iter = pkgs.iterator(); iter.hasNext();) {
- providedCapabilities[i++] = createProvidedCapability(iter.next());
+ for (Tuple tuple : pkgs) {
+ providedCapabilities[i++] = createProvidedCapability(tuple);
}
providedCapabilities[i++] = MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, currentIU.getId(), currentIU.getVersion());
providedCapabilities[i++] = MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, currentIU.getId(), currentIU.getVersion());
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java
index b372c211e..75d7732c1 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ant/Repo2RunnableTaskTests.java
@@ -16,7 +16,6 @@ package org.eclipse.equinox.p2.tests.ant;
import java.io.*;
import java.net.URI;
-import java.util.Iterator;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
@@ -139,8 +138,7 @@ public class Repo2RunnableTaskTests extends AbstractAntProvisioningTest {
fail("Failed to load repository", e);
}
IQueryResult<IArtifactKey> keys = repo.query(ArtifactKeyQuery.ALL_KEYS, null);
- for (Iterator<IArtifactKey> iterator = keys.iterator(); iterator.hasNext();) {
- IArtifactKey key = iterator.next();
+ for (IArtifactKey key : keys) {
IArtifactDescriptor[] descriptors = repo.getArtifactDescriptors(key);
for (IArtifactDescriptor desc : descriptors) {
// Features should be unzipped, others should not be.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java
index 1cf77c6a7..ac8cd521a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java
@@ -677,9 +677,9 @@ public class ProfileRegistryTest extends AbstractProvisioningTest {
assertEquals(3, timestamps.length);
int fail = 0;
- for (int i = 0; i < timestamps.length; i++) {
+ for (long timestamp : timestamps) {
try {
- registry.removeProfile(PROFILE_NAME, timestamps[i]);
+ registry.removeProfile(PROFILE_NAME, timestamp);
} catch (ProvisionException e) {
fail++;
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java
index 4114955c9..b2ba3a29b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java
@@ -17,7 +17,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringReader;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -191,8 +190,8 @@ public class ProfileTest extends AbstractProvisioningTest {
if (profiles.length > 0) {
start(PROFILES_ELEMENT);
attribute(COLLECTION_SIZE_ATTRIBUTE, profiles.length);
- for (int i = 0; i < profiles.length; i++) {
- writeProfile(profiles[i]);
+ for (IProfile profile : profiles) {
+ writeProfile(profile);
}
end(PROFILES_ELEMENT);
}
@@ -289,8 +288,7 @@ public class ProfileTest extends AbstractProvisioningTest {
return new IProfile[0];
Map<String, IProfile> profileMap = new LinkedHashMap<>();
- for (Iterator<String> it = profileHandlers.keySet().iterator(); it.hasNext();) {
- String profileId = it.next();
+ for (String profileId : profileHandlers.keySet()) {
addProfile(profileId, profileMap);
}
@@ -314,13 +312,11 @@ public class ProfileTest extends AbstractProvisioningTest {
profile.setTimestamp(profileHandler.getTimestamp());
IInstallableUnit[] ius = profileHandler.getInstallableUnits();
if (ius != null) {
- for (int i = 0; i < ius.length; i++) {
- IInstallableUnit iu = ius[i];
+ for (IInstallableUnit iu : ius) {
profile.addInstallableUnit(iu);
Map<String, String> iuProperties = profileHandler.getIUProperties(iu);
if (iuProperties != null) {
- for (Iterator<Entry<String, String>> it = iuProperties.entrySet().iterator(); it.hasNext();) {
- Entry<String, String> entry = it.next();
+ for (Entry<String, String> entry : iuProperties.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
profile.setInstallableUnitProperty(iu, key, value);
@@ -367,8 +363,8 @@ public class ProfileTest extends AbstractProvisioningTest {
@Override
protected Object getRootObject() {
Map<String, IProfile> result = new HashMap<>();
- for (int i = 0; i < profiles.length; i++) {
- result.put(profiles[i].getProfileId(), profiles[i]);
+ for (IProfile profile : profiles) {
+ result.put(profile.getProfileId(), profile);
}
return result;
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java
index f94021124..f59711b2f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java
@@ -31,7 +31,6 @@ import java.io.IOException;
import java.net.URI;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Iterator;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
@@ -289,8 +288,8 @@ public class ProductActionTest extends ActionTest {
Collection<IRequirement> requiredCapabilities = unit.getRequirements();
IRequiredCapability capability = null;
- for (Iterator<IRequirement> iterator = requiredCapabilities.iterator(); iterator.hasNext();) {
- IRequiredCapability req = (IRequiredCapability) iterator.next();
+ for (IRequirement iRequirement : requiredCapabilities) {
+ IRequiredCapability req = (IRequiredCapability) iRequirement;
if (req.getName().equals("org.eclipse.platform.feature.group")) {
capability = req;
break;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java
index c98cdff73..3713365f3 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/ql/PerformanceTest.java
@@ -198,8 +198,7 @@ public class PerformanceTest extends AbstractProvisioningTest {
start = System.currentTimeMillis();
for (int idx = 0; idx < 80; ++idx) {
int sz = 0;
- for (Iterator<IInstallableUnit> iter = repo.query(QueryUtil.createIUAnyQuery(), new NullProgressMonitor()).iterator(); iter.hasNext();) {
- IInstallableUnit candidate = iter.next();
+ for (IInstallableUnit candidate : repo.query(QueryUtil.createIUAnyQuery(), new NullProgressMonitor())) {
if (candidate.getId().startsWith("org.eclipse."))
sz++;
}
@@ -445,8 +444,8 @@ public class PerformanceTest extends AbstractProvisioningTest {
private IInstallableUnit[] gatherAvailableInstallableUnits(IQueryable<IInstallableUnit> queryable) {
ArrayList<IInstallableUnit> list = new ArrayList<>();
IQueryResult<IInstallableUnit> matches = queryable.query(QueryUtil.createIUAnyQuery(), null);
- for (Iterator<IInstallableUnit> it = matches.iterator(); it.hasNext();)
- list.add(it.next());
+ for (IInstallableUnit iInstallableUnit : matches)
+ list.add(iInstallableUnit);
return list.toArray(new IInstallableUnit[list.size()]);
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java
index 51ade4115..9bdee681a 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java
@@ -135,8 +135,8 @@ public class RepositoryDiscoveryStrategy extends AbstractDiscoveryStrategy {
+ //
": properties['org.eclipse.equinox.p2.type.category'] == true"); //$NON-NLS-1$
IQueryResult<IInstallableUnit> result = repository.query(query, monitor.newChild(1));
- for (Iterator<IInstallableUnit> iter = result.iterator(); iter.hasNext();) {
- process(repository, iter.next());
+ for (IInstallableUnit iInstallableUnit : result) {
+ process(repository, iInstallableUnit);
}
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java
index 4765154ef..a3d803b61 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java
@@ -70,8 +70,8 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses {
root = new IUElementListRoot(ui);
ArrayList<AvailableIUElement> list = new ArrayList<>(selectedElements.length);
ArrayList<AvailableIUElement> selected = new ArrayList<>(selectedElements.length);
- for (int i = 0; i < selectedElements.length; i++) {
- IInstallableUnit iu = ElementUtils.getIU(selectedElements[i]);
+ for (Object selectedElement : selectedElements) {
+ IInstallableUnit iu = ElementUtils.getIU(selectedElement);
if (iu != null) {
AvailableIUElement element = new AvailableIUElement(root, iu, getProfileId(), shouldShowProvisioningPlanChildren());
list.add(element);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java
index 88c75032b..1324340f6 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RemediationGroup.java
@@ -131,8 +131,7 @@ public class RemediationGroup {
checkboxes.get(ALLOWDIFFERENTVERSION_INDEX).setSelection(remedy != null && remedy.getConfig().allowDifferentVersion);
checkboxes.get(ALLOWINSTALLEDUPDATE_INDEX).setSelection(remedy != null && remedy.getConfig().allowInstalledUpdate);
checkboxes.get(ALLOWINSTALLEDREMOVAL_INDEX).setSelection(remedy != null && remedy.getConfig().allowInstalledRemoval);
- for (Iterator<Button> iterator = checkboxes.iterator(); iterator.hasNext();) {
- Button btn1 = iterator.next();
+ for (Button btn1 : checkboxes) {
btn1.setVisible(true);
}
if (btn == buildMyOwnSolution && btn.getSelection()) {
@@ -289,8 +288,7 @@ public class RemediationGroup {
versions.add(ProvUIMessages.RemedyElementRequestedVersion + iuDetail.getRequestedVersion().toString());
if (iuDetail.getBeingInstalledVersion() != null)
versions.add(ProvUIMessages.RemedyElementBeingInstalledVersion + iuDetail.getBeingInstalledVersion().toString());
- for (Iterator<String> iterator = versions.iterator(); iterator.hasNext();) {
- String version = iterator.next();
+ for (String version : versions) {
toolTipText += (toolTipText == "" ? "" : "\n") + version; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
if (containerPage != null && containerPage.getWizard() instanceof UpdateWizard && compare(iuDetail.getBeingInstalledVersion(), iuDetail.getRequestedVersion()) < 0)
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java
index be0de7ec5..13a4dc51e 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java
@@ -254,9 +254,9 @@ public abstract class ResolutionResultsWizardPage extends ResolutionStatusPage {
if (operation == null || operation.getProvisioningPlan() == null)
return;
Object[] elements = root.getChildren(root);
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] instanceof QueriedElement) {
- ((QueriedElement) elements[i]).setQueryable(getQueryable(operation.getProvisioningPlan()));
+ for (Object element : elements) {
+ if (element instanceof QueriedElement) {
+ ((QueriedElement) element).setQueryable(getQueryable(operation.getProvisioningPlan()));
}
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
index 8955bf7ff..f295541bd 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
@@ -133,9 +133,9 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
if (cachedElements == null) {
Object[] children = super.fetchChildren(o, monitor);
cachedElements = new Hashtable<>(children.length);
- for (int i = 0; i < children.length; i++) {
- if (children[i] instanceof MetadataRepositoryElement) {
- put((MetadataRepositoryElement) children[i]);
+ for (Object element : children) {
+ if (element instanceof MetadataRepositoryElement) {
+ put((MetadataRepositoryElement) element);
}
}
}
@@ -520,9 +520,9 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
MetadataRepositoryElement[] getSelectedElements() {
Object[] items = repositoryViewer.getStructuredSelection().toArray();
ArrayList<Object> list = new ArrayList<>(items.length);
- for (int i = 0; i < items.length; i++) {
- if (items[i] instanceof MetadataRepositoryElement)
- list.add(items[i]);
+ for (Object item : items) {
+ if (item instanceof MetadataRepositoryElement)
+ list.add(item);
}
return list.toArray(new MetadataRepositoryElement[list.size()]);
}
@@ -641,8 +641,8 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
}
boolean includesRepo(URI[] repos, URI repo) {
- for (int i = 0; i < repos.length; i++)
- if (repos[i].equals(repo))
+ for (URI repo2 : repos)
+ if (repo2.equals(repo))
return true;
return false;
}

Back to the top