From 680b7ea1ff9dd2dfc8248f3d9d1c92023bd746d4 Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Wed, 25 Sep 2019 21:52:41 +0200 Subject: 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: I044ba2ecb69c7c5e1f30b6c60f345078b2fa7b3b Signed-off-by: Carsten Hammer --- .../p2/artifact/repository/MirrorSelector.java | 3 +- .../p2/artifact/repository/SignatureVerifier.java | 9 +-- .../simple/SimpleArtifactRepositoryIO.java | 14 ++--- .../internal/p2/console/ProvCommandProvider.java | 64 ++++++++++++---------- 4 files changed, 49 insertions(+), 41 deletions(-) diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java index eda0fe019..3e21e1ba1 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java @@ -370,8 +370,7 @@ public class MirrorSelector { public synchronized void reportResult(String toDownload, IStatus result) { if (mirrors == null) return; - for (int i = 0; i < mirrors.length; i++) { - MirrorInfo mirror = mirrors[i]; + for (MirrorInfo mirror : mirrors) { if (toDownload.startsWith(mirror.locationString)) { if (!result.isOK() && result.getSeverity() != IStatus.CANCEL) { // Punishing a mirror harshly for a FileNotFoundException can be very wrong. diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java index 2a0c420b1..45ac40936 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java @@ -93,15 +93,16 @@ public class SignatureVerifier extends ProcessingStep { } ArrayList allStatus = new ArrayList<>(0); SignedContentEntry[] entries = signedContent.getSignedEntries(); - for (int i = 0; i < entries.length; i++) + for (SignedContentEntry entry : entries) { try { - entries[i].verify(); + entry.verify(); } catch (InvalidContentException e) { - allStatus.add(new Status(IStatus.ERROR, Activator.ID, MirrorRequest.ARTIFACT_PROCESSING_ERROR, Messages.SignatureVerification_invalidContent + entries[i].getName(), e)); - } catch (OutOfMemoryError e) { + allStatus.add(new Status(IStatus.ERROR, Activator.ID, MirrorRequest.ARTIFACT_PROCESSING_ERROR, Messages.SignatureVerification_invalidContent + entry.getName(), e)); + }catch (OutOfMemoryError e) { allStatus.add(new Status(IStatus.ERROR, Activator.ID, Messages.SignatureVerifier_OutOfMemory, e)); break; } + } if (allStatus.size() > 0) return new MultiStatus(Activator.ID, IStatus.ERROR, allStatus.toArray(new IStatus[allStatus.size()]), Messages.SignatureVerification_invalidFileContent + inputFile, null); return Status.OK_STATUS; diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java index da50ce095..65bc6a4be 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java @@ -249,10 +249,10 @@ public class SimpleArtifactRepositoryIO { if (rules.length > 0) { start(MAPPING_RULES_ELEMENT); attribute(COLLECTION_SIZE_ATTRIBUTE, rules.length); - for (int i = 0; i < rules.length; i++) { + for (String[] rule : rules) { start(MAPPING_RULE_ELEMENT); - attribute(MAPPING_RULE_FILTER_ATTRIBUTE, rules[i][0]); - attribute(MAPPING_RULE_OUTPUT_ATTRIBUTE, rules[i][1]); + attribute(MAPPING_RULE_FILTER_ATTRIBUTE, rule[0]); + attribute(MAPPING_RULE_OUTPUT_ATTRIBUTE, rule[1]); end(MAPPING_RULE_ELEMENT); } end(MAPPING_RULES_ELEMENT); @@ -280,11 +280,11 @@ public class SimpleArtifactRepositoryIO { if (processingSteps.length > 0) { start(PROCESSING_STEPS_ELEMENT); attribute(COLLECTION_SIZE_ATTRIBUTE, processingSteps.length); - for (int i = 0; i < processingSteps.length; i++) { + for (IProcessingStepDescriptor processingStep : processingSteps) { start(PROCESSING_STEP_ELEMENT); - attribute(ID_ATTRIBUTE, processingSteps[i].getProcessorId()); - attribute(STEP_DATA_ATTRIBUTE, processingSteps[i].getData()); - attribute(STEP_REQUIRED_ATTRIBUTE, processingSteps[i].isRequired()); + attribute(ID_ATTRIBUTE, processingStep.getProcessorId()); + attribute(STEP_DATA_ATTRIBUTE, processingStep.getData()); + attribute(STEP_REQUIRED_ATTRIBUTE, processingStep.isRequired()); end(PROCESSING_STEP_ELEMENT); } end(PROCESSING_STEPS_ELEMENT); diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java index bd7ed06cb..b32dfc642 100644 --- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java +++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java @@ -256,8 +256,9 @@ public class ProvCommandProvider implements CommandProvider { repoURL = toURI(interpreter, urlString); IInstallableUnit[] units = sort(ProvisioningHelper.getInstallableUnits(agent, repoURL, QueryUtil.createIUQuery(id, VersionRange.create(version)), null)); - for (int i = 0; i < units.length; i++) - println(interpreter, units[i]); + for (IInstallableUnit unit : units) { + println(interpreter, unit); + } } /** @@ -287,8 +288,9 @@ public class ProvCommandProvider implements CommandProvider { if (units.length == 0) interpreter.println("No units found"); else { - for (int i = 0; i < units.length; i++) - println(interpreter, units[i]); + for (IInstallableUnit unit : units) { + println(interpreter, unit); + } } } @@ -305,8 +307,9 @@ public class ProvCommandProvider implements CommandProvider { if (urlString == null) { URI[] repositories = ProvisioningHelper.getMetadataRepositories(agent); if (repositories != null) - for (int i = 0; i < repositories.length; i++) - interpreter.println(repositories[i]); + for (URI repository : repositories) { + interpreter.println(repository); + } return; } URI repoLocation = toURI(interpreter, urlString); @@ -314,8 +317,9 @@ public class ProvCommandProvider implements CommandProvider { return; IInstallableUnit[] units = sort(ProvisioningHelper.getInstallableUnits(agent, repoLocation, QueryUtil.createIUQuery(id, VersionRange.create(version)), null)); - for (int i = 0; i < units.length; i++) - println(interpreter, units[i]); + for (IInstallableUnit unit : units) { + println(interpreter, unit); + } } /** @@ -340,8 +344,9 @@ public class ProvCommandProvider implements CommandProvider { return; } IInstallableUnit[] units = sort(queryable.query(QueryUtil.createIUGroupQuery(), null)); - for (int i = 0; i < units.length; i++) - println(interpreter, units[i]); + for (IInstallableUnit unit : units) { + println(interpreter, unit); + } } /** @@ -356,8 +361,9 @@ public class ProvCommandProvider implements CommandProvider { URI[] repositories = ProvisioningHelper.getArtifactRepositories(agent); if (repositories == null) return; - for (int i = 0; i < repositories.length; i++) - interpreter.println(repositories[i]); + for (URI repository : repositories) { + interpreter.println(repository); + } return; } URI repoURL = toURI(interpreter, urlString); @@ -376,11 +382,9 @@ public class ProvCommandProvider implements CommandProvider { return; } IFileArtifactRepository fileRepo = repo.getAdapter(IFileArtifactRepository.class); - for (Iterator iterator = keys.iterator(); iterator.hasNext();) { - IArtifactKey key = iterator.next(); + for (IArtifactKey key : keys) { IArtifactDescriptor[] descriptors = repo.getArtifactDescriptors(key); - for (int j = 0; j < descriptors.length; j++) { - IArtifactDescriptor descriptor = descriptors[j]; + for (IArtifactDescriptor descriptor : descriptors) { File location = null; if (fileRepo != null) location = fileRepo.getArtifactFile(descriptor); @@ -425,8 +429,9 @@ public class ProvCommandProvider implements CommandProvider { interpreter.println("No profile found"); return; } - for (int i = 0; i < profiles.length; i++) - interpreter.println(profiles[i].getProfileId()); + for (IProfile profile : profiles) { + interpreter.println(profile.getProfileId()); + } return; } // determine which profile is to be listed @@ -445,8 +450,9 @@ public class ProvCommandProvider implements CommandProvider { // list the profile contents IInstallableUnit[] result = sort(target.query(QueryUtil.createIUQuery(id, VersionRange.create(range)), null)); - for (int i = 0; i < result.length; i++) - interpreter.println(result[i]); + for (IInstallableUnit unit : result) { + interpreter.println(unit); + } } /** @@ -474,9 +480,9 @@ public class ProvCommandProvider implements CommandProvider { // else if there are some timestamps then print them out on separate line interpreter.print("Timestamps for profile "); interpreter.println(profileId); - for (int i = 0; i < profileTimestamps.length; i++) { + for (long profileTimestamp : profileTimestamps) { interpreter.print("\t"); //$NON-NLS-1$ - interpreter.println(Long.valueOf(profileTimestamps[i])); + interpreter.println(Long.valueOf(profileTimestamp)); } } @@ -549,8 +555,9 @@ public class ProvCommandProvider implements CommandProvider { } IInstallableUnit[] units = sort(profile.query(QueryUtil.createIUGroupQuery(), new NullProgressMonitor())); // Now print out results - for (int i = 0; i < units.length; i++) - println(interpreter, units[i]); + for (IInstallableUnit unit : units) { + println(interpreter, unit); + } } /** @@ -592,8 +599,9 @@ public class ProvCommandProvider implements CommandProvider { if (units.length == 0) interpreter.println("No units found"); else { - for (int i = 0; i < units.length; i++) - println(interpreter, units[i]); + for (IInstallableUnit unit : units) { + println(interpreter, unit); + } } } @@ -680,8 +688,8 @@ public class ProvCommandProvider implements CommandProvider { IStatus[] children = status.getChildren(); if (children != null && children.length > 0) { interpreter.println("Error status children:"); - for (int i = 0; i < children.length; i++) { - printErrorStatus(interpreter, children[i]); + for (IStatus child : children) { + printErrorStatus(interpreter, child); } } interpreter.println("--End Error Status--"); -- cgit v1.2.3