diff options
author | Carsten Hammer | 2019-09-25 20:01:09 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-10-14 13:33:03 +0000 |
commit | f17aeff069804a760934c6618c41718ccd71e7d1 (patch) | |
tree | 3e7ffeb21f9199e74551840b2d8ad729809cecc9 | |
parent | aa3e83b820b65e64a3db410632e20c44edcca832 (diff) | |
download | rt.equinox.p2-f17aeff069804a760934c6618c41718ccd71e7d1.tar.gz rt.equinox.p2-f17aeff069804a760934c6618c41718ccd71e7d1.tar.xz rt.equinox.p2-f17aeff069804a760934c6618c41718ccd71e7d1.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: If1e3c7f01ec53c79e70bc79a2f3a08be262201f5
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
9 files changed, 33 insertions, 28 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java index afa04ed1c..98c4f2fd0 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java @@ -76,8 +76,8 @@ public class EclipseMarkSetProvider extends MarkSetProvider { ArrayList<Feature> result = new ArrayList<>(); for (Site object : sites) { Feature[] features = object.getFeatures(); - for (int i = 0; i < features.length; i++) { - result.add(features[i]); + for (Feature feature : features) { + result.add(feature); } } return result; @@ -127,12 +127,10 @@ public class EclipseMarkSetProvider extends MarkSetProvider { // Find for each bundle info a corresponding artifact in repo private static List<IArtifactKey> findCorrespondinArtifacts(BundleInfo[] bis, IArtifactRepository repo) { ArrayList<IArtifactKey> toRetain = new ArrayList<>(); - for (int i = 0; i < bis.length; i++) { + for (BundleInfo bi : bis) { // if version is "0.0.0", we will use null to find all versions, see bug 305710 - Version version = BundleInfo.EMPTY_VERSION.equals(bis[i].getVersion()) ? null - : Version.create(bis[i].getVersion()); - IArtifactKey match = searchArtifact(bis[i].getSymbolicName(), version, ARTIFACT_CLASSIFIER_OSGI_BUNDLE, - repo); + Version version = BundleInfo.EMPTY_VERSION.equals(bi.getVersion()) ? null : Version.create(bi.getVersion()); + IArtifactKey match = searchArtifact(bi.getSymbolicName(), version, ARTIFACT_CLASSIFIER_OSGI_BUNDLE, repo); if (match != null) toRetain.add(match); } diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java index 90e954d62..fe5368e18 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java @@ -215,9 +215,10 @@ public class PlatformConfigurationWrapper { List<Site> sites = configuration.getSites(); for (Site site : sites) { Feature[] features = site.getFeatures(); - for (int i = 0; i < features.length; i++) { - if (id.equals(features[i].getId()) && version.equals(features[i].getVersion())) + for (Feature feature : features) { + if (id.equals(feature.getId()) && version.equals(feature.getVersion())) { return site; + } } } return null; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java index 8074469c6..1a68f8917 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java @@ -170,15 +170,15 @@ public class Util { private static void getRunnableRepositories(IArtifactRepositoryManager manager, List<IFileArtifactRepository> bundleRepositories) { URI[] localURLs = manager.getKnownRepositories(IRepositoryManager.REPOSITORIES_LOCAL); - for (int i = 0; i < localURLs.length; i++) { + for (URI localURL : localURLs) { try { - IArtifactRepository candidate = manager.loadRepository(localURLs[i], new NullProgressMonitor()); + IArtifactRepository candidate = manager.loadRepository(localURL, new NullProgressMonitor()); if (Boolean.parseBoolean(candidate.getProperty(IArtifactRepository.PROP_RUNNABLE))) { if (candidate != null && candidate instanceof IFileArtifactRepository - && !bundleRepositories.contains(candidate)) + && !bundleRepositories.contains(candidate)) bundleRepositories.add((IFileArtifactRepository) candidate); } - } catch (ProvisionException e) { + }catch (ProvisionException e) { // skip repositories that could not be read } } diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java index d65fcf9b6..6c11207de 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java @@ -199,9 +199,11 @@ public class AddJVMArgumentAction extends ProvisioningAction { // Get the current used argument if there is one protected static String getCurrentArg(String flag, String[] jvmArgs) { - for (int i = 0; i < jvmArgs.length; i++) - if (jvmArgs[i] != null && jvmArgs[i].startsWith(flag)) - return jvmArgs[i]; + for (String jvmArg : jvmArgs) { + if (jvmArg != null && jvmArg.startsWith(flag)) { + return jvmArg; + } + } return null; } diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java index a7186cf0b..28ccc754a 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java @@ -104,8 +104,9 @@ public class ChmodAction extends ProvisioningAction { int i = 0; args[i++] = "chmod"; //$NON-NLS-1$ if (options != null) { - for (int j = 0; j < options.length; j++) - args[i++] = options[j]; + for (String option : options) { + args[i++] = option; + } } args[i++] = perms; args[i] = targetDir + IPath.SEPARATOR + targetFile; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java index b7c987924..04ee36e16 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RemoveJVMArgumentAction.java @@ -105,9 +105,11 @@ public class RemoveJVMArgumentAction extends ProvisioningAction { else { // Build a comma separated list of values for this flag String argString = ""; //$NON-NLS-1$ - for (int i = 0; i < args.length; i++) - if (args[i] != null) - argString += args[i] + ','; + for (String arg : args) { + if (arg != null) { + argString += arg + ','; + } + } if (argString.length() > 0) // Strip the trailing comma diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java index 2532dc4f0..793e78295 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java @@ -203,8 +203,9 @@ abstract class RepositoryAction extends ProvisioningAction { try { String[] keys = node.keys(); - for (int i = 0; i < keys.length; i++) - node.remove(keys[i]); + for (String key : keys) { + node.remove(key); + } } catch (BackingStoreException e) { // TODO: Should this be passed back to be associated with State? } diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java index 0b19c573f..1bb1693ff 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java @@ -147,8 +147,7 @@ public class ConfigurationWriter implements ConfigurationConstants { private static void write(XMLWriter writer, Feature[] features) { if (features == null || features.length == 0) return; - for (int i = 0; i < features.length; i++) { - Feature feature = features[i]; + for (Feature feature : features) { Map<String, String> args = new HashMap<>(); String value = feature.getId(); if (value != null) diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java index 78c9e1cd9..c20168927 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java @@ -178,10 +178,11 @@ public class Site { return false; if (one.length != two.length) return false; - for (int i = 0; i < one.length; i++) { + for (Object one1 : one) { boolean found = false; - for (int j = 0; !found && j < two.length; j++) - found = one[i].equals(two[j]); + for (int j = 0; !found && j < two.length; j++) { + found = one1.equals(two[j]); + } if (!found) return false; } |