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: I8288cda24e7fab9b6e518400488389e6a54ddc9c
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Activator.java b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Activator.java
index 2c65e43..9a34bae 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/Activator.java
@@ -158,14 +158,14 @@
Bundle[] bundles = packageAdmin.getBundles(bundleId, null);
if (bundles != null && bundles.length > 0) {
- for (int i = 0; i < bundles.length; i++) {
+ for (Bundle bundle : bundles) {
try {
- if ((bundles[i].getState() & Bundle.INSTALLED) == 0) {
- bundles[i].start(Bundle.START_ACTIVATION_POLICY);
- bundles[i].start(Bundle.START_TRANSIENT);
+ if ((bundle.getState() & Bundle.INSTALLED) == 0) {
+ bundle.start(Bundle.START_ACTIVATION_POLICY);
+ bundle.start(Bundle.START_TRANSIENT);
return true;
}
- } catch (BundleException e) {
+ }catch (BundleException e) {
// failed, try next bundle
}
}
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/RepositoryStatusHelper.java b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/RepositoryStatusHelper.java
index 90c23b1..2cab4f3 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/RepositoryStatusHelper.java
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/RepositoryStatusHelper.java
@@ -211,8 +211,9 @@
if (status.isMultiStatus()) {
IStatus[] children = status.getChildren();
- for (int i = 0; i < children.length; i++)
- deeplyPrint(children[i], strm, stackTrace, level + 1);
+ for (IStatus child : children) {
+ deeplyPrint(child, strm, stackTrace, level + 1);
+ }
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoryTracker.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoryTracker.java
index 5fdc16e..f12434e 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoryTracker.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoryTracker.java
@@ -56,8 +56,8 @@
public void removeRepositories(URI[] repoLocations, ProvisioningSession session) {
ui.signalRepositoryOperationStart();
try {
- for (int i = 0; i < repoLocations.length; i++) {
- getArtifactRepositoryManager().removeRepository(repoLocations[i]);
+ for (URI repoLocation : repoLocations) {
+ getArtifactRepositoryManager().removeRepository(repoLocation);
}
} finally {
ui.signalRepositoryOperationComplete(null, true);
@@ -68,10 +68,10 @@
public void refreshRepositories(URI[] locations, ProvisioningSession session, IProgressMonitor monitor) {
ui.signalRepositoryOperationStart();
SubMonitor mon = SubMonitor.convert(monitor, locations.length * 100);
- for (int i = 0; i < locations.length; i++) {
+ for (URI location : locations) {
try {
- getArtifactRepositoryManager().refreshRepository(locations[i], mon.newChild(100));
- } catch (ProvisionException e) {
+ getArtifactRepositoryManager().refreshRepository(location, mon.newChild(100));
+ }catch (ProvisionException e) {
// ignore problematic repositories when refreshing
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/InstallAction.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/InstallAction.java
index 180234e..8ddafa8 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/InstallAction.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/InstallAction.java
@@ -49,10 +49,11 @@
// We allow non-IU's to be selected at this point, but there
// must be at least one installable unit selected that is
// selectable
- for (int i = 0; i < selectionArray.length; i++) {
- if (selectionArray[i] instanceof InstalledIUElement && isSelectable((IIUElement) selectionArray[i]))
+ for (Object selectionArray1 : selectionArray) {
+ if (selectionArray1 instanceof InstalledIUElement && isSelectable((IIUElement) selectionArray1)) {
return true;
- IInstallableUnit iu = ProvUI.getAdapter(selectionArray[i], IInstallableUnit.class);
+ }
+ IInstallableUnit iu = ProvUI.getAdapter(selectionArray1, IInstallableUnit.class);
if (iu != null && isSelectable(iu))
return true;
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoryTracker.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoryTracker.java
index 2ca9b98..5ea9a63 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoryTracker.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoryTracker.java
@@ -56,8 +56,8 @@
public void removeRepositories(URI[] repoLocations, ProvisioningSession session) {
ui.signalRepositoryOperationStart();
try {
- for (int i = 0; i < repoLocations.length; i++) {
- getMetadataRepositoryManager().removeRepository(repoLocations[i]);
+ for (URI repoLocation : repoLocations) {
+ getMetadataRepositoryManager().removeRepository(repoLocation);
}
} finally {
ui.signalRepositoryOperationComplete(null, true);
@@ -68,10 +68,10 @@
public void refreshRepositories(URI[] locations, ProvisioningSession session, IProgressMonitor monitor) {
ui.signalRepositoryOperationStart();
SubMonitor mon = SubMonitor.convert(monitor, locations.length * 100);
- for (int i = 0; i < locations.length; i++) {
+ for (URI location : locations) {
try {
- getMetadataRepositoryManager().refreshRepository(locations[i], mon.newChild(100));
- } catch (ProvisionException e) {
+ getMetadataRepositoryManager().refreshRepository(location, mon.newChild(100));
+ }catch (ProvisionException e) {
//ignore problematic repositories when refreshing
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java
index 2a786e5..7bf6cd7 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java
@@ -59,9 +59,10 @@
public void run() {
Object[] selections = getSelection().toArray();
List<String> profilesOnly = new ArrayList<>();
- for (int i = 0; i < selections.length; i++) {
- if (selections[i] instanceof ProfileElement)
- profilesOnly.add(((ProfileElement) selections[i]).getProfileId());
+ for (Object selection : selections) {
+ if (selection instanceof ProfileElement) {
+ profilesOnly.add(((ProfileElement) selection).getProfileId());
+ }
}
RemoveProfilesJob op = new RemoveProfilesJob(ProvAdminUIMessages.Ops_RemoveProfileOperationLabel, getProvisioningUI().getSession(), profilesOnly.toArray(new String[profilesOnly.size()]));
ProfilesView.this.run(op);
@@ -171,8 +172,8 @@
Object[] selectionArray = ss.toArray();
if (selectionArray.length > 0) {
removeProfileAction.setEnabled(true);
- for (int i = 0; i < selectionArray.length; i++) {
- IProfile profile = ProvUI.getAdapter(selectionArray[i], IProfile.class);
+ for (Object selectionArray1 : selectionArray) {
+ IProfile profile = ProvUI.getAdapter(selectionArray1, IProfile.class);
if (profile == null) {
removeProfileAction.setEnabled(false);
break;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RemoveProfilesJob.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RemoveProfilesJob.java
index 4e70fe8..ba6fcf5 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RemoveProfilesJob.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RemoveProfilesJob.java
@@ -32,8 +32,8 @@
@Override
public IStatus runModal(IProgressMonitor monitor) {
- for (int i = 0; i < profileIds.length; i++) {
- ProvAdminUIActivator.getDefault().getProfileRegistry().removeProfile(profileIds[i]);
+ for (String profileId : profileIds) {
+ ProvAdminUIActivator.getDefault().getProfileRegistry().removeProfile(profileId);
}
return Status.OK_STATUS;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java
index 4dbfc68..d8ce80a 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java
@@ -59,9 +59,10 @@
RepositoryTracker tracker = RepositoriesView.this.getRepositoryTracker();
Object[] elements = getSelection().toArray();
ArrayList<URI> uris = new ArrayList<>(elements.length);
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] instanceof IRepositoryElement<?>)
- uris.add(((IRepositoryElement<?>) elements[i]).getLocation());
+ for (Object element : elements) {
+ if (element instanceof IRepositoryElement<?>) {
+ uris.add(((IRepositoryElement<?>) element).getLocation());
+ }
}
tracker.removeRepositories(uris.toArray(new URI[uris.size()]), RepositoriesView.this.getProvisioningUI().getSession());
}
@@ -79,9 +80,11 @@
public void run() {
Object[] elements = ((ITreeContentProvider) viewer.getContentProvider()).getElements(getInput());
ArrayList<URI> urls = new ArrayList<>();
- for (int i = 0; i < elements.length; i++)
- if (elements[i] instanceof IRepositoryElement<?>)
- urls.add(((IRepositoryElement<?>) elements[i]).getLocation());
+ for (Object element : elements) {
+ if (element instanceof IRepositoryElement<?>) {
+ urls.add(((IRepositoryElement<?>) element).getLocation());
+ }
+ }
openAddRepositoryDialog(getShell());
}
}
@@ -174,8 +177,8 @@
propertiesAction.setEnabled(selection.size() == 1 && ((ProvUI.getAdapter(selection.getFirstElement(), IInstallableUnit.class) != null) || (isRepository(selection.getFirstElement()))));
boolean enabled = false;
Object[] selectionArray = selection.toArray();
- for (int i = 0; i < selectionArray.length; i++) {
- if (!isRepository(selectionArray[i])) {
+ for (Object selectionArray1 : selectionArray) {
+ if (!isRepository(selectionArray1)) {
enabled = false;
break;
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java
index f51af51..0f67b37 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java
@@ -102,8 +102,8 @@
return false;
}
- for (int i = 0; i < knownProfileIds.length; i++) {
- if (knownProfileIds[i].equals(profileGroup.getProfileId())) {
+ for (String knownProfileId : knownProfileIds) {
+ if (knownProfileId.equals(profileGroup.getProfileId())) {
setOkEnablement(false);
this.updateStatus(new Status(IStatus.ERROR, ProvAdminUIActivator.PLUGIN_ID, IStatus.OK, ProvAdminUIMessages.AddProfileDialog_DuplicateProfileID, null));
return true;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java
index 250841d..da1ec56 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java
@@ -231,8 +231,8 @@
void copySelectionsToClipboard(List list) {
StringBuffer buffer = new StringBuffer();
String[] selections = list.getSelection();
- for (int i = 0; i < selections.length; i++) {
- buffer.append(selections[i]);
+ for (String selection : selections) {
+ buffer.append(selection);
buffer.append("\n"); //$NON-NLS-1$
}
Clipboard clipboard = new Clipboard(list.getDisplay());
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java
index 082bc29..9e39138 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java
@@ -133,9 +133,9 @@
Map<String, String> repoProperties = getRepositoryElement().getRepository(null).getProperties();
if (repoProperties != null) {
String[] propNames = repoProperties.keySet().toArray(new String[repoProperties.size()]);
- for (int i = 0; i < propNames.length; i++) {
+ for (String propName : propNames) {
TableItem item = new TableItem(propertiesTable, SWT.NULL);
- item.setText(new String[] {propNames[i], repoProperties.get(propNames[i]).toString()});
+ item.setText(new String[]{propName, repoProperties.get(propName).toString()});
}
}
}
