diff options
author | Carsten Hammer | 2019-12-06 17:31:29 +0000 |
---|---|---|
committer | Carsten Hammer | 2019-12-13 19:11:50 +0000 |
commit | eba34e5ead4d9e6d01484840f03d875c1d2b6a3d (patch) | |
tree | 35fde7540a2e011f17649ea51137a97f4aca1d16 | |
parent | ab1285ab13f2eab58aa9740245eb23c557486d07 (diff) | |
download | rt.equinox.p2-eba34e5ead4d9e6d01484840f03d875c1d2b6a3d.tar.gz rt.equinox.p2-eba34e5ead4d9e6d01484840f03d875c1d2b6a3d.tar.xz rt.equinox.p2-eba34e5ead4d9e6d01484840f03d875c1d2b6a3d.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: Ibb46940ad17faa7dc5cec0aeaba016222fc07935
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
18 files changed, 105 insertions, 103 deletions
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/BundlePoolFilteredListener.java b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/BundlePoolFilteredListener.java index 2bc66c2fa..a87523eee 100644 --- a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/BundlePoolFilteredListener.java +++ b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/BundlePoolFilteredListener.java @@ -17,7 +17,6 @@ import java.io.File; import java.util.*; import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener; import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.repository.artifact.ArtifactKeyQuery; import org.eclipse.equinox.p2.repository.artifact.IFileArtifactRepository; @@ -30,9 +29,7 @@ public class BundlePoolFilteredListener extends DirectoryChangeListener { delegate = listener; IFileArtifactRepository bundlePool = Activator.getBundlePoolRepository(); if (bundlePool != null) { - IQueryResult<IArtifactKey> keys = bundlePool.query(ArtifactKeyQuery.ALL_KEYS, null); - for (Iterator<IArtifactKey> iterator = keys.iterator(); iterator.hasNext();) { - IArtifactKey key = iterator.next(); + for (IArtifactKey key : bundlePool.query(ArtifactKeyQuery.ALL_KEYS, null)) { File artifactFile = bundlePool.getArtifactFile(key); if (artifactFile != null) bundlePoolFiles.add(artifactFile); diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/And.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/And.java index 2d7bc5d41..8bccc213c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/And.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/And.java @@ -26,8 +26,8 @@ final class And extends NAry { @Override public Object evaluate(IEvaluationContext context) { - for (int idx = 0; idx < operands.length; ++idx) { - if (operands[idx].evaluate(context) != Boolean.TRUE) + for (Expression operand : operands) { + if (operand.evaluate(context) != Boolean.TRUE) return Boolean.FALSE; } return Boolean.TRUE; @@ -51,8 +51,8 @@ final class And extends NAry { @Override public void toLDAPString(StringBuffer buf) { buf.append("(&"); //$NON-NLS-1$ - for (int idx = 0; idx < operands.length; ++idx) - operands[idx].toLDAPString(buf); + for (Expression operand : operands) + operand.toLDAPString(buf); buf.append(')'); } } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractAntProvisioningTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractAntProvisioningTest.java index e1a8d8bd3..f3b693ab8 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractAntProvisioningTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractAntProvisioningTest.java @@ -190,8 +190,8 @@ public class AbstractAntProvisioningTest extends AbstractProvisioningTest { writer.attribute(iter.next(), iter.next()); // write sub elements if applicable - for (Iterator<AntTaskElement> iter = task.elements.iterator(); iter.hasNext();) - writeElement(writer, iter.next()); + for (AntTaskElement element : task.elements) + writeElement(writer, element); // close tag writer.end(); @@ -274,8 +274,8 @@ public class AbstractAntProvisioningTest extends AbstractProvisioningTest { protected static List<IArtifactKey> getArtifactKeys(IQueryResult<IInstallableUnit> ius) { List<IArtifactKey> keys = new ArrayList<>(); - for (Iterator<IInstallableUnit> iter = ius.iterator(); iter.hasNext();) - keys.addAll(iter.next().getArtifacts()); + for (IInstallableUnit iu : ius) + keys.addAll(iu.getArtifacts()); return keys; } } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java index 84d42a057..47fa2acaf 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java @@ -1006,8 +1006,7 @@ public abstract class AbstractProvisioningTest extends TestCase { //remove all metadata repositories created by this test IMetadataRepositoryManager repoMan = getMetadataRepositoryManager(); if (!metadataRepos.isEmpty()) { - for (Iterator<IMetadataRepository> it = metadataRepos.iterator(); it.hasNext();) { - IMetadataRepository repo = it.next(); + for (IMetadataRepository repo : metadataRepos) { repoMan.removeRepository(repo.getLocation()); } metadataRepos.clear(); @@ -1314,9 +1313,7 @@ public abstract class AbstractProvisioningTest extends TestCase { * Note: NOT BICONDITIONAL! assertContains(A, B) is NOT the same as assertContains(B, A) */ protected static void assertContains(String message, IArtifactRepository sourceRepo, IArtifactRepository destinationRepo) { - IQueryResult<IArtifactKey> sourceKeys = sourceRepo.query(ArtifactKeyQuery.ALL_KEYS, null); - for (Iterator<IArtifactKey> iterator = sourceKeys.iterator(); iterator.hasNext();) { - IArtifactKey key = iterator.next(); + for (IArtifactKey key : sourceRepo.query(ArtifactKeyQuery.ALL_KEYS, null)) { IArtifactDescriptor[] destinationDescriptors = destinationRepo.getArtifactDescriptors(key); if (destinationDescriptors == null || destinationDescriptors.length == 0) fail(message + ": unmatched key: " + key.toString()); @@ -1680,9 +1677,7 @@ public abstract class AbstractProvisioningTest extends TestCase { } protected void assertEqualArtifacts(String message, SimpleArtifactRepository expected, SimpleArtifactRepository actual) { - IQueryResult<IArtifactKey> expectedKeys = expected.query(ArtifactKeyQuery.ALL_KEYS, null); - for (Iterator<IArtifactKey> iterator = expectedKeys.iterator(); iterator.hasNext();) { - IArtifactKey key = iterator.next(); + for (IArtifactKey key : expected.query(ArtifactKeyQuery.ALL_KEYS, null)) { IArtifactDescriptor[] expectedDescriptors = expected.getArtifactDescriptors(key); IArtifactDescriptor[] actualDescriptors = actual.getArtifactDescriptors(key); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java index 9a607f1c3..fbe28d547 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java @@ -32,7 +32,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; @@ -98,14 +97,13 @@ public class CompositeArtifactRepositoryTest extends AbstractProvisioningTest { //create a compressed repo createRepo(true); - File files[] = repositoryFile.listFiles(); boolean jarFilePresent = false; boolean artifactFilePresent = false; - for (int i = 0; i < files.length; i++) { - if ("compositeArtifacts.jar".equalsIgnoreCase(files[i].getName())) { + for (File file : repositoryFile.listFiles()) { + if ("compositeArtifacts.jar".equalsIgnoreCase(file.getName())) { jarFilePresent = true; } - if ("compositeArtifacts.xml".equalsIgnoreCase(files[i].getName())) { + if ("compositeArtifacts.xml".equalsIgnoreCase(file.getName())) { artifactFilePresent = false; } } @@ -119,14 +117,13 @@ public class CompositeArtifactRepositoryTest extends AbstractProvisioningTest { //Setup: create an uncompressed repository createRepo(false); - File files[] = repositoryFile.listFiles(); boolean jarFilePresent = false; boolean artifactFilePresent = false; - for (int i = 0; i < files.length; i++) { - if ("compositeArtifacts.jar".equalsIgnoreCase(files[i].getName())) { + for (File file : repositoryFile.listFiles()) { + if ("compositeArtifacts.jar".equalsIgnoreCase(file.getName())) { jarFilePresent = true; } - if ("compositeArtifacts.xml".equalsIgnoreCase(files[i].getName())) { + if ("compositeArtifacts.xml".equalsIgnoreCase(file.getName())) { artifactFilePresent = true; } } @@ -1349,8 +1346,7 @@ public class CompositeArtifactRepositoryTest extends AbstractProvisioningTest { good.setAccessible(true); List<?> list = (List<?>) field.get(parent); - for (Iterator<?> listIter = list.iterator(); listIter.hasNext();) { - Object obj = listIter.next(); + for (Object obj : list) { if (child.equals(repo.get(obj))) { good.set(obj, false); return; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/AbstractDirectoryWatcherTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/AbstractDirectoryWatcherTest.java index 013e0be8f..8ddb76513 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/AbstractDirectoryWatcherTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/AbstractDirectoryWatcherTest.java @@ -35,8 +35,8 @@ public abstract class AbstractDirectoryWatcherTest extends AbstractProvisioningT @Override protected void tearDown() throws Exception { super.tearDown(); - for (Iterator<File> iter = toRemove.iterator(); iter.hasNext();) - delete(iter.next()); + for (File file : toRemove) + delete(file); toRemove = new HashSet<>(); } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java index 321e5b4e9..f43cf4fbb 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/ArtifactMirrorApplicationTest.java @@ -894,12 +894,8 @@ public class ArtifactMirrorApplicationTest extends AbstractProvisioningTest { fail(""); } - IQueryResult<IArtifactKey> keys = packedRepo.query(ArtifactKeyQuery.ALL_KEYS, null); - for (Iterator<IArtifactKey> iterator = keys.iterator(); iterator.hasNext();) { - IArtifactKey key = iterator.next(); - IArtifactDescriptor[] srcDescriptors = packedRepo.getArtifactDescriptors(key); - - for (IArtifactDescriptor srcDescriptor : srcDescriptors) { + for (IArtifactKey key : packedRepo.query(ArtifactKeyQuery.ALL_KEYS, null)) { + for (IArtifactDescriptor srcDescriptor : packedRepo.getArtifactDescriptors(key)) { if (!(srcDescriptor.getProperty(IArtifactDescriptor.FORMAT) == null) && srcDescriptor.getProperty(IArtifactDescriptor.FORMAT).equals(IArtifactDescriptor.FORMAT_PACKED)) { //if we have a packed artifact IArtifactDescriptor newDescriptor = new ArtifactDescriptor(key); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AbstractPlannerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AbstractPlannerTest.java index 4ddd49bfb..1f322eb7f 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AbstractPlannerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AbstractPlannerTest.java @@ -18,7 +18,6 @@ import java.lang.reflect.Field; import java.net.URI; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest; import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand; @@ -134,8 +133,7 @@ public abstract class AbstractPlannerTest extends AbstractProvisioningTest { // add optional IUs if (optionalAdds != null) { - for (Iterator<IInstallableUnit> iter = optionalAdds.iterator(); iter.hasNext();) { - IInstallableUnit iu = iter.next(); + for (IInstallableUnit iu : optionalAdds) { result.add(iu); result.setInstallableUnitInclusionRules(iu, ProfileInclusionRules.createOptionalInclusionRule(iu)); result.setInstallableUnitProfileProperty(iu, "org.eclipse.equinox.p2.type.lock", "1"); @@ -145,8 +143,7 @@ public abstract class AbstractPlannerTest extends AbstractProvisioningTest { // add strict IUs if (strictAdds != null) { - for (Iterator<IInstallableUnit> iter = strictAdds.iterator(); iter.hasNext();) { - IInstallableUnit iu = iter.next(); + for (IInstallableUnit iu : strictAdds) { result.add(iu); result.setInstallableUnitInclusionRules(iu, ProfileInclusionRules.createStrictInclusionRule(iu)); } @@ -154,8 +151,7 @@ public abstract class AbstractPlannerTest extends AbstractProvisioningTest { // include removals if (toRemove != null) { - for (Iterator<IInstallableUnit> iter = toRemove.iterator(); iter.hasNext();) { - IInstallableUnit iu = iter.next(); + for (IInstallableUnit iu : toRemove) { result.remove(iu); } } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllOrbit.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllOrbit.java index 56d01d377..f5c6a6c91 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllOrbit.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/AllOrbit.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.p2.tests.planner; import java.util.ArrayList; -import java.util.Iterator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest; @@ -51,8 +50,7 @@ public class AllOrbit extends AbstractProvisioningTest { ProfileChangeRequest req1 = new ProfileChangeRequest(profile1); IQueryResult<IInstallableUnit> allIUs = repo.query(QueryUtil.createIUAnyQuery(), null); req1.addInstallableUnits(allIUs.toArray(IInstallableUnit.class)); - for (Iterator<IInstallableUnit> iterator = allIUs.iterator(); iterator.hasNext();) { - IInstallableUnit iu = iterator.next(); + for (IInstallableUnit iu : allIUs) { if (!iu.getId().equals("javax.wsdl")) req1.setInstallableUnitInclusionRules(iu, ProfileInclusionRules.createOptionalInclusionRule(iu)); } @@ -65,8 +63,7 @@ public class AllOrbit extends AbstractProvisioningTest { ProfileChangeRequest req1 = new ProfileChangeRequest(profile1); IQueryResult<IInstallableUnit> allIUs = repo.query(QueryUtil.createIUAnyQuery(), null); ArrayList<IInstallableUnit> toInstall = new ArrayList<>(); - for (Iterator<IInstallableUnit> iterator = allIUs.iterator(); iterator.hasNext();) { - IInstallableUnit toAdd = iterator.next(); + for (IInstallableUnit toAdd : allIUs) { if (!toAdd.getId().equals("com.ibm.icu")) { toInstall.add(toAdd); } @@ -83,8 +80,7 @@ public class AllOrbit extends AbstractProvisioningTest { ProfileChangeRequest req1 = new ProfileChangeRequest(profile1); IQueryResult<IInstallableUnit> allIUs = repo.query(QueryUtil.createIUAnyQuery(), null); ArrayList<IInstallableUnit> toInstall = new ArrayList<>(); - for (Iterator<IInstallableUnit> iterator = allIUs.iterator(); iterator.hasNext();) { - IInstallableUnit toAdd = iterator.next(); + for (IInstallableUnit toAdd : allIUs) { if (!toAdd.getId().equals("com.ibm.icu")) { toInstall.add(toAdd); req1.setInstallableUnitInclusionRules(toAdd, ProfileInclusionRules.createOptionalInclusionRule(toAdd)); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug300572.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug300572.java index 0f55b25d1..33e3c68f5 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug300572.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug300572.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.p2.tests.planner; import java.util.Arrays; -import java.util.Iterator; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.core.IProvisioningAgentProvider; @@ -55,8 +54,7 @@ public class Bug300572 extends AbstractProvisioningTest { IProfileChangeRequest request = planner.createChangeRequest(sdkProfile); IQueryResult<IInstallableUnit> allIUs = repo.query(QueryUtil.ALL_UNITS, null); request.addAll(allIUs.toUnmodifiableSet()); - for (Iterator<IInstallableUnit> allIUsIterator = allIUs.iterator(); allIUsIterator.hasNext();) { - IInstallableUnit iu = allIUsIterator.next(); + for (IInstallableUnit iu : allIUs) { request.setInstallableUnitInclusionRules(iu, ProfileInclusionRules.createOptionalInclusionRule(iu)); } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug362692.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug362692.java index 728b66443..cc57a8ebf 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug362692.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/Bug362692.java @@ -14,8 +14,15 @@ package org.eclipse.equinox.p2.tests.planner; import java.net.URI; -import java.util.*; -import org.eclipse.core.runtime.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand; import org.eclipse.equinox.p2.engine.IProvisioningPlan; import org.eclipse.equinox.p2.engine.ProvisioningContext; @@ -23,7 +30,9 @@ import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.planner.IPlanner; import org.eclipse.equinox.p2.planner.IProfileChangeRequest; -import org.eclipse.equinox.p2.query.*; +import org.eclipse.equinox.p2.query.IQuery; +import org.eclipse.equinox.p2.query.IQueryResult; +import org.eclipse.equinox.p2.query.QueryUtil; import org.eclipse.equinox.p2.tests.TestActivator; public class Bug362692 extends AbstractPlannerTest { @@ -62,11 +71,9 @@ public class Bug362692 extends AbstractPlannerTest { // create the actual plan - install everything in the repo as optional (mimic the dropins folder) Set<IInstallableUnit> toAdd = new HashSet<>(); - IQueryResult<IInstallableUnit> allIUs = repo.query(QueryUtil.createIUAnyQuery(), new NullProgressMonitor()); // we don't want to re-install units which are already installed in the profile so remove them. (this is what the reconciler does) boolean already = false; - for (Iterator<IInstallableUnit> iter = allIUs.iterator(); iter.hasNext();) { - IInstallableUnit iu = iter.next(); + for (IInstallableUnit iu : repo.query(QueryUtil.createIUAnyQuery(), new NullProgressMonitor())) { //toAdd.add(iu); queryResult = getProfile().query(QueryUtil.createIUQuery(iu.getId(), iu.getVersion()), new NullProgressMonitor()); if (queryResult.isEmpty()) { @@ -94,8 +101,8 @@ public class Bug362692 extends AbstractPlannerTest { Collection<InstallableUnitOperand> compressedPlan = compress(plan); if (compressedPlan.isEmpty()) System.out.println("Plan: ...is empty!"); - for (Iterator<InstallableUnitOperand> iter = compressedPlan.iterator(); iter.hasNext();) { - System.out.println("Plan: " + iter.next()); + for (InstallableUnitOperand installableUnitOperand : compressedPlan) { + System.out.println("Plan: " + installableUnitOperand); } validate(expected, plan); } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ANYConfigCUsActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ANYConfigCUsActionTest.java index 26c6fa490..bb92cf4ef 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ANYConfigCUsActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ANYConfigCUsActionTest.java @@ -105,9 +105,7 @@ public class ANYConfigCUsActionTest extends ActionTest { } private void verifyFragment(String cuType) { - ArrayList<IInstallableUnit> IUs = new ArrayList<>(publisherResult.getIUs(null, IPublisherResult.NON_ROOT)); - for (int i = 0; i < IUs.size(); i++) { - IInstallableUnit iu = IUs.get(i); + for (IInstallableUnit iu : new ArrayList<>(publisherResult.getIUs(null, IPublisherResult.NON_ROOT))) { if (iu.getId().equals(flavor + id + "." + cuType + "." + configSpec)) { //$NON-NLS-1$ //$NON-NLS-2$ assertNull(iu.getFilter()); // no filter if config spec is ANY diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java index 15a57843b..7c54ec066 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java @@ -15,16 +15,45 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.reconciler.dropins; -import java.io.*; -import java.net.*; -import java.util.*; -import org.eclipse.core.runtime.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; import org.eclipse.equinox.frameworkadmin.BundleInfo; -import org.eclipse.equinox.internal.p2.core.helpers.*; +import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; +import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; +import org.eclipse.equinox.internal.p2.core.helpers.URLUtil; import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry; import org.eclipse.equinox.internal.p2.engine.SurrogateProfileHandler; import org.eclipse.equinox.internal.p2.jarprocessor.StreamProcessor; -import org.eclipse.equinox.internal.p2.update.*; +import org.eclipse.equinox.internal.p2.update.Configuration; +import org.eclipse.equinox.internal.p2.update.Feature; +import org.eclipse.equinox.internal.p2.update.Site; import org.eclipse.equinox.internal.p2.updatesite.Activator; import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl; import org.eclipse.equinox.p2.core.ProvisionException; @@ -479,9 +508,7 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest { */ public boolean removeSite(Configuration configuration, String location) throws IOException, URISyntaxException { File left = new File(new URI(location)).getCanonicalFile(); - List<Site> sites = configuration.getSites(); - for (Iterator<Site> iter = sites.iterator(); iter.hasNext();) { - Site tempSite = iter.next(); + for (Site tempSite : configuration.getSites()) { String siteURL = tempSite.getUrl(); File right = new File(new URI(siteURL)).getCanonicalFile(); if (left.equals(right)) { @@ -553,8 +580,7 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest { List<Site> sites = configuration.getSites(); assertNotNull(message, sites); boolean found = false; - for (Iterator<Site> iter = sites.iterator(); iter.hasNext();) { - Site site = iter.next(); + for (Site site : sites) { Feature[] features = site.getFeatures(); for (int i = 0; features != null && i < features.length; i++) { if (id.equals(features[i].getId())) { diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/CatalogViewer.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/CatalogViewer.java index eda1bcad6..f7ad21549 100644 --- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/CatalogViewer.java +++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/CatalogViewer.java @@ -28,7 +28,6 @@ import org.eclipse.equinox.internal.p2.ui.discovery.DiscoveryUi; import org.eclipse.equinox.internal.p2.ui.discovery.util.*; import org.eclipse.equinox.p2.engine.IProfile; import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.query.QueryUtil; import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.jface.dialogs.MessageDialog; @@ -450,9 +449,7 @@ public class CatalogViewer extends FilteredViewer { Set<String> features = new HashSet<>(); IProfile profile = ProvUI.getProfileRegistry(ProvisioningUI.getDefaultUI().getSession()).getProfile(ProvisioningUI.getDefaultUI().getProfileId()); if (profile != null) { - IQueryResult<IInstallableUnit> result = profile.available(QueryUtil.createIUGroupQuery(), monitor); - for (Iterator<IInstallableUnit> it = result.iterator(); it.hasNext();) { - IInstallableUnit unit = it.next(); + for (IInstallableUnit unit : profile.available(QueryUtil.createIUGroupQuery(), monitor)) { features.add(unit.getId()); } } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ColocatedRepositoryAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ColocatedRepositoryAction.java index 0d901485b..bdaf317d4 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ColocatedRepositoryAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ColocatedRepositoryAction.java @@ -23,7 +23,8 @@ import org.eclipse.jface.viewers.ISelectionProvider; public abstract class ColocatedRepositoryAction extends ProvisioningAction { - public ColocatedRepositoryAction(ProvisioningUI ui, String label, String tooltipText, ISelectionProvider selectionProvider) { + public ColocatedRepositoryAction(ProvisioningUI ui, String label, String tooltipText, + ISelectionProvider selectionProvider) { super(ui, label, selectionProvider); setToolTipText(tooltipText); init(); @@ -31,9 +32,10 @@ public abstract class ColocatedRepositoryAction extends ProvisioningAction { protected URI[] getSelectedLocations(Object[] selectionArray) { List<URI> urls = new ArrayList<>(); - for (int i = 0; i < selectionArray.length; i++) { - if (selectionArray[i] instanceof MetadataRepositoryElement) - urls.add(((MetadataRepositoryElement) selectionArray[i]).getLocation()); + for (Object element : selectionArray) { + if (element instanceof MetadataRepositoryElement) { + urls.add(((MetadataRepositoryElement) element).getLocation()); + } } return urls.toArray(new URI[urls.size()]); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java index 8d98772d6..af618ecb7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java @@ -296,9 +296,9 @@ public class AvailableIUGroup extends StructuredIUGroup { public Object[] getSelectedIUElements() { Object[] elements = viewer.getStructuredSelection().toArray(); ArrayList<Object> list = new ArrayList<>(elements.length); - for (int i = 0; i < elements.length; i++) - if (ElementUtils.getIU(elements[i]) != null) - list.add(elements[i]); + for (Object element : elements) + if (ElementUtils.getIU(element) != null) + list.add(element); return list.toArray(); } @@ -315,9 +315,9 @@ public class AvailableIUGroup extends StructuredIUGroup { if (selections.length == 0) return new IInstallableUnit[0]; ArrayList<IInstallableUnit> leaves = new ArrayList<>(selections.length); - for (int i = 0; i < selections.length; i++) { - if (!getCheckboxTreeViewer().getGrayed(selections[i])) { - IInstallableUnit iu = ProvUI.getAdapter(selections[i], IInstallableUnit.class); + for (Object selection : selections) { + if (!getCheckboxTreeViewer().getGrayed(selection)) { + IInstallableUnit iu = ProvUI.getAdapter(selection, IInstallableUnit.class); if (iu != null && !ProvUI.isCategory(iu) && !leaves.contains(iu)) leaves.add(iu); } @@ -391,13 +391,12 @@ public class AvailableIUGroup extends StructuredIUGroup { if (event.getJob() == lastRequestedLoadJob) { final Tree tree = treeViewer.getTree(); if (tree != null && !tree.isDisposed()) { - TreeItem[] items = tree.getItems(); - for (int i = 0; i < items.length; i++) { - if (items[i].getData() instanceof IRepositoryElement) { - URI url = ((IRepositoryElement<?>) items[i].getData()).getLocation(); + for (TreeItem item : tree.getItems()) { + if (item.getData() instanceof IRepositoryElement) { + URI url = ((IRepositoryElement<?>) item.getData()).getLocation(); if (url.equals(location)) { - treeViewer.expandToLevel(items[i].getData(), AbstractTreeViewer.ALL_LEVELS); - tree.select(items[i]); + treeViewer.expandToLevel(item.getData(), AbstractTreeViewer.ALL_LEVELS); + tree.select(item); return; } } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ComboAutoCompleteField.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ComboAutoCompleteField.java index 9439b0d0f..e5cb0e648 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ComboAutoCompleteField.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ComboAutoCompleteField.java @@ -57,9 +57,9 @@ public class ComboAutoCompleteField { return new IContentProposal[0]; StringMatcher matcher = new StringMatcher("*" + contents + "*", true, false); //$NON-NLS-1$ //$NON-NLS-2$ ArrayList<String> matches = new ArrayList<>(); - for (int i1 = 0; i1 < items.length; i1++) - if (matcher.match(items[i1])) - matches.add(items[i1]); + for (String item : items) + if (matcher.match(item)) + matches.add(item); // We don't want to autoactivate if the only proposal exactly matches // what is in the combo. This prevents the popup from diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java index 011e4d59e..a88ced032 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java @@ -387,8 +387,7 @@ public class AcceptLicensesWizardPage extends WizardPage { // the same. licensesToIUs = new HashMap<>();//map of License->ArrayList of IUs with that license HashMap<ILicense, HashSet<String>> namesSeen = new HashMap<>(); // map of License->HashSet of names with that license - for (int i = 0; i < iusToCheck.length; i++) { - IInstallableUnit iu = iusToCheck[i]; + for (IInstallableUnit iu : iusToCheck) { for (ILicense license : iu.getLicenses(null)) { if (manager != null && !manager.isAccepted(license)) { String name = iu.getProperty(IInstallableUnit.PROP_NAME, null); |