Bug 548309 - Use jdk 5 for-each loop (org.eclipse.ltk.ui.refactoring)
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: I5e06bd0bb3bea54f7644ed2d5d5a42b9daaffe6f
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractChangeNode.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractChangeNode.java
index 13e42e0..6a2118d 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractChangeNode.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractChangeNode.java
@@ -120,10 +120,10 @@
@Override
boolean hasOneGroupCategory(List<GroupCategory> categories) {
- PreviewNode[] children= getChildren();
- for (int i= 0; i < children.length; i++) {
- if (children[i].hasOneGroupCategory(categories))
+ for (PreviewNode child : getChildren()) {
+ if (child.hasOneGroupCategory(categories)) {
return true;
+ }
}
return false;
}
@@ -132,10 +132,10 @@
boolean hasDerived() {
if (hasDerivedResourceChange(fChange))
return true;
- PreviewNode[] children= getChildren();
- for (int i= 0; i < children.length; i++) {
- if (children[i].hasDerived())
+ for (PreviewNode child : getChildren()) {
+ if (child.hasDerived()) {
return true;
+ }
}
return false;
}
@@ -143,8 +143,8 @@
int getDefaultChangeActive() {
int result= fChange.isEnabled() ? ACTIVE : INACTIVE;
if (fChildren != null) {
- for (int i= 0; i < fChildren.length; i++) {
- result= ACTIVATION_TABLE[fChildren[i].getActive()][result];
+ for (PreviewNode child : fChildren) {
+ result= ACTIVATION_TABLE[child.getActive()][result];
if (result == PARTLY_ACTIVE)
break;
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java
index bd3e2a0..79419b4 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java
@@ -177,8 +177,7 @@
}
private void grayChildren(Item[] items, boolean grayed) {
- for (int i= 0; i < items.length; i++) {
- Item element= items[i];
+ for (Item element : items) {
if (element instanceof TreeItem) {
TreeItem item= (TreeItem)element;
if (item.getGrayed() != grayed) {
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/CompositeChangeNode.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/CompositeChangeNode.java
index 5b9bf08..165a7fc 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/CompositeChangeNode.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/CompositeChangeNode.java
@@ -48,9 +48,7 @@
}
private void getFlattendedChildren(List<PreviewNode> result, CompositeChangeNode parent, CompositeChange focus) {
- Change[] changes= focus.getChildren();
- for (int i= 0; i < changes.length; i++) {
- Change change= changes[i];
+ for (Change change : focus.getChildren()) {
if (fFilter == null || fFilter.select(change)) {
if (change instanceof CompositeChange && ((CompositeChange) change).isSynthetic()) {
getFlattendedChildren(result, parent, (CompositeChange) change);
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java
index 6c4b472..c701b71 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java
@@ -41,8 +41,7 @@
init();
List<AbstractDescriptor> candidates= new ArrayList<>(1);
- for (int i= 0; i < fExtensions.length; i++) {
- AbstractDescriptor descriptor= fExtensions[i];
+ for (AbstractDescriptor descriptor : fExtensions) {
if (descriptor.matches(element, fVariableName)) {
candidates.add(descriptor);
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/InternalLanguageElementNode.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/InternalLanguageElementNode.java
index ea4d875..9bb5158 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/InternalLanguageElementNode.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/InternalLanguageElementNode.java
@@ -14,7 +14,6 @@
package org.eclipse.ltk.internal.ui.refactoring;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.core.runtime.Assert;
@@ -66,8 +65,7 @@
@Override
void setEnabled(boolean enabled) {
- for (Iterator<ChildNode> iter= fChildren.iterator(); iter.hasNext();) {
- PreviewNode element= iter.next();
+ for (PreviewNode element : fChildren) {
element.setEnabled(enabled);
}
}
@@ -108,8 +106,7 @@
boolean hasDerived() {
if (fChildren == null)
return false;
- for (Iterator<ChildNode> iter= fChildren.iterator(); iter.hasNext();) {
- PreviewNode node= iter.next();
+ for (PreviewNode node : fChildren) {
if (node.hasDerived())
return true;
}
@@ -119,8 +116,7 @@
private GroupCategorySet getGroupCategorySet() {
if (fGroupCategories == null) {
fGroupCategories= GroupCategorySet.NONE;
- for (Iterator<ChildNode> iter= fChildren.iterator(); iter.hasNext();) {
- PreviewNode node= iter.next();
+ for (PreviewNode node : fChildren) {
GroupCategorySet other= null;
if (node instanceof TextEditGroupNode) {
other= ((TextEditGroupNode)node).getGroupCategorySet();
@@ -143,9 +139,7 @@
private List<TextEditBasedChangeGroup> collectTextEditBasedChangeGroups(List<GroupCategory> categories) {
List<TextEditBasedChangeGroup> result= new ArrayList<>(10);
- PreviewNode[] children= getChildren();
- for (int i= 0; i < children.length; i++) {
- PreviewNode child= children[i];
+ for (PreviewNode child : getChildren()) {
if (child instanceof TextEditGroupNode) {
TextEditBasedChangeGroup changeGroup= ((TextEditGroupNode)child).getChangeGroup();
if (categories == null || changeGroup.getGroupCategorySet().containsOneCategory(categories))
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
index 08b00c3..bc8a7e7 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
@@ -251,8 +251,8 @@
fMenu= new Menu(parent);
if (fFilterActions.length != 0) {
new ActionContributionItem(fShowAllAction).fill(fMenu, -1);
- for (int i= 0; i < fFilterActions.length; i++) {
- new ActionContributionItem(fFilterActions[i]).fill(fMenu, -1);
+ for (FilterAction fFilterAction : fFilterActions) {
+ new ActionContributionItem(fFilterAction).fill(fMenu, -1);
}
new MenuItem(fMenu, SWT.SEPARATOR);
}
@@ -663,13 +663,14 @@
}
private boolean hasChanges(CompositeChange change) {
- final Change[] children= change.getChildren();
- for (int index= 0; index < children.length; index++) {
- if (children[index] instanceof CompositeChange) {
- if (hasChanges((CompositeChange) children[index]))
+ for (Change child : change.getChildren()) {
+ if (child instanceof CompositeChange) {
+ if (hasChanges((CompositeChange) child)) {
return true;
- } else
+ }
+ } else {
return true;
+ }
}
return false;
}
@@ -684,14 +685,12 @@
private void collectGroupCategories(Set<GroupCategory> result, Change change) {
if (change instanceof TextEditBasedChange) {
- TextEditBasedChangeGroup[] groups= ((TextEditBasedChange)change).getChangeGroups();
- for (int i= 0; i < groups.length; i++) {
- result.addAll(groups[i].getGroupCategorySet().asList());
+ for (TextEditBasedChangeGroup group : ((TextEditBasedChange)change).getChangeGroups()) {
+ result.addAll(group.getGroupCategorySet().asList());
}
} else if (change instanceof CompositeChange) {
- Change[] children= ((CompositeChange)change).getChildren();
- for (int i= 0; i < children.length; i++) {
- collectGroupCategories(result, children[i]);
+ for (Change child : ((CompositeChange)change).getChildren()) {
+ collectGroupCategories(result, child);
}
}
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringLocationControl.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringLocationControl.java
index bf5acee..23802dd 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringLocationControl.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringLocationControl.java
@@ -115,8 +115,9 @@
String[] locations= settings.getArray(fKey);
if (locations == null || locations.length == 0)
return;
- for (int index= 0; index < locations.length; index++)
- fCombo.add(locations[index]);
+ for (String location : locations) {
+ fCombo.add(location);
+ }
fCombo.select(0);
}
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java
index 2aa45da..dcf850a 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java
@@ -15,7 +15,6 @@
import java.net.URL;
import java.util.HashMap;
-import java.util.Iterator;
import org.osgi.framework.Bundle;
@@ -135,8 +134,7 @@
/* package */ static ImageRegistry getImageRegistry() {
if (fgImageRegistry == null) {
fgImageRegistry= new ImageRegistry();
- for (Iterator<String> iter= fgAvoidSWTErrorMap.keySet().iterator(); iter.hasNext();) {
- String key= iter.next();
+ for (String key : fgAvoidSWTErrorMap.keySet()) {
fgImageRegistry.put(key, fgAvoidSWTErrorMap.get(key));
}
fgAvoidSWTErrorMap= null;
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIPlugin.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIPlugin.java
index d5e04a6..a0c6953 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIPlugin.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIPlugin.java
@@ -93,13 +93,10 @@
public static IEditorPart[] getInstanciatedEditors() {
List<IEditorPart> result= new ArrayList<>(0);
IWorkbench workbench= PlatformUI.getWorkbench();
- IWorkbenchWindow[] windows= workbench.getWorkbenchWindows();
- for (int windowIndex= 0; windowIndex < windows.length; windowIndex++) {
- IWorkbenchPage[] pages= windows[windowIndex].getPages();
- for (int pageIndex= 0; pageIndex < pages.length; pageIndex++) {
- IEditorReference[] references= pages[pageIndex].getEditorReferences();
- for (int refIndex= 0; refIndex < references.length; refIndex++) {
- IEditorPart editor= references[refIndex].getEditor(false);
+ for (IWorkbenchWindow window : workbench.getWorkbenchWindows()) {
+ for (IWorkbenchPage page : window.getPages()) {
+ for (IEditorReference reference : page.getEditorReferences()) {
+ IEditorPart editor= reference.getEditor(false);
if (editor != null)
result.add(editor);
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog2.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog2.java
index bcc96aa..cb246dc 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog2.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog2.java
@@ -385,9 +385,9 @@
}
private void setDisplayCursor(Display d, Cursor c) {
- Shell[] shells= d.getShells();
- for (int i= 0; i < shells.length; i++)
- shells[i].setCursor(c);
+ for (Shell shell : d.getShells()) {
+ shell.setCursor(c);
+ }
}
private void stopped(Map<String, Object> savedState) {
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/AbstractResourcesHandler.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/AbstractResourcesHandler.java
index 5c55a84..c75a200 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/AbstractResourcesHandler.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/AbstractResourcesHandler.java
@@ -64,8 +64,8 @@
}
if (traversals != null) {
- for (int i= 0; i < traversals.length; i++) {
- IResource[] traversalResources= traversals[i].getResources();
+ for (ResourceTraversal traversal : traversals) {
+ IResource[] traversalResources= traversal.getResources();
if (traversalResources != null) {
resources.addAll(Arrays.asList(traversalResources)); // for
}// if
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/AcceptRefactoringsAction.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/AcceptRefactoringsAction.java
index 476d5b5..505260d 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/AcceptRefactoringsAction.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/AcceptRefactoringsAction.java
@@ -120,9 +120,9 @@
@Override
public boolean isEnabled() {
if (fProxies != null && fProxies.length > 0) {
- for (int index= 0; index < fProxies.length; index++) {
- if (fProxies[index] instanceof RefactoringDescriptorSynchronizationProxy) {
- final RefactoringDescriptorSynchronizationProxy proxy= (RefactoringDescriptorSynchronizationProxy) fProxies[index];
+ for (RefactoringDescriptorProxy fproxy : fProxies) {
+ if (fproxy instanceof RefactoringDescriptorSynchronizationProxy) {
+ final RefactoringDescriptorSynchronizationProxy proxy= (RefactoringDescriptorSynchronizationProxy) fproxy;
if (proxy.getDirection() == IThreeWayDiff.INCOMING)
return true;
}
@@ -140,13 +140,13 @@
final WizardDialog dialog= new WizardDialog(fShell, wizard);
IProject project= null;
Set<RefactoringDescriptorSynchronizationProxy> proxies= new HashSet<>();
- for (int index= 0; index < fProxies.length; index++) {
- if (fProxies[index] instanceof RefactoringDescriptorSynchronizationProxy) {
- final RefactoringDescriptorSynchronizationProxy proxy= (RefactoringDescriptorSynchronizationProxy) fProxies[index];
+ for (RefactoringDescriptorProxy fproxy : fProxies) {
+ if (fproxy instanceof RefactoringDescriptorSynchronizationProxy) {
+ final RefactoringDescriptorSynchronizationProxy proxy= (RefactoringDescriptorSynchronizationProxy) fproxy;
if (proxy.getDirection() == IThreeWayDiff.INCOMING)
proxies.add(proxy);
}
- String name= fProxies[index].getProject();
+ String name= fproxy.getProject();
if (name != null && !"".equals(name)) //$NON-NLS-1$
project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/RejectRefactoringsAction.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/RejectRefactoringsAction.java
index 05fc761..aad0a9c 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/RejectRefactoringsAction.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/actions/RejectRefactoringsAction.java
@@ -64,9 +64,9 @@
@Override
public boolean isEnabled() {
if (fProxies != null && fProxies.length > 0 && fContext instanceof IMergeContext) {
- for (int index= 0; index < fProxies.length; index++) {
- if (fProxies[index] instanceof RefactoringDescriptorSynchronizationProxy) {
- final RefactoringDescriptorSynchronizationProxy proxy= (RefactoringDescriptorSynchronizationProxy) fProxies[index];
+ for (RefactoringDescriptorProxy fproxy : fProxies) {
+ if (fproxy instanceof RefactoringDescriptorSynchronizationProxy) {
+ final RefactoringDescriptorSynchronizationProxy proxy= (RefactoringDescriptorSynchronizationProxy) fproxy;
if (proxy.getDirection() == IThreeWayDiff.INCOMING)
return true;
}
@@ -86,8 +86,9 @@
try {
monitor.beginTask("", fProxies.length + 100); //$NON-NLS-1$
final RefactoringHistoryService service= RefactoringHistoryService.getInstance();
- for (int index= 0; index < fProxies.length; index++)
- service.addRefactoringDescriptor(fProxies[index], new SubProgressMonitor(monitor, 1));
+ for (RefactoringDescriptorProxy proxy : fProxies) {
+ service.addRefactoringDescriptor(proxy, new SubProgressMonitor(monitor, 1));
+ }
} finally {
monitor.done();
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/BrowseRefactoringHistoryContentProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/BrowseRefactoringHistoryContentProvider.java
index 7b1dcc4..828143c 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/BrowseRefactoringHistoryContentProvider.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/BrowseRefactoringHistoryContentProvider.java
@@ -116,9 +116,7 @@
fProjectRefactoringHistories= new HashMap<>();
Map<String, Collection<RefactoringDescriptorProxy>> projectRefactoringHistories= new HashMap<>();
if (fRefactoringHistory != null && !fRefactoringHistory.isEmpty()) {
- final RefactoringDescriptorProxy[] proxies= fRefactoringHistory.getDescriptors();
- for (int index= 0; index < proxies.length; index++) {
- final RefactoringDescriptorProxy proxy= proxies[index];
+ for (RefactoringDescriptorProxy proxy : fRefactoringHistory.getDescriptors()) {
String current= proxy.getProject();
if (current == null || current.length() == 0)
current= WORKSPACE_PROJECT;
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryControl.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryControl.java
index 901ddc6..e8770f4 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryControl.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryControl.java
@@ -146,9 +146,8 @@
* the changed element
*/
private void reconcileCheckState(final Object element) {
- final Object[] children= getChildren(element);
- for (int index= 0; index < children.length; index++) {
- reconcileCheckState(children[index]);
+ for (Object child : getChildren(element)) {
+ reconcileCheckState(child);
}
int checkCount= 0;
final Collection<RefactoringDescriptorProxy> collection= getCoveredDescriptors(element);
@@ -234,9 +233,8 @@
*/
private void setSubTreeGrayed(final Object element, final boolean grayed) {
setElementGrayed(element, grayed);
- final Object[] children= getChildren(element);
- for (int index= 0; index < children.length; index++) {
- setSubTreeGrayed(children[index], grayed);
+ for (Object child : getChildren(element)) {
+ setSubTreeGrayed(child, grayed);
}
}
}
@@ -532,9 +530,7 @@
final RefactoringDescriptorProxy proxy= entry.getDescriptor();
set.add(proxy);
} else {
- final Object[] children= provider.getChildren(element);
- for (int index= 0; index < children.length; index++) {
- final Object child= children[index];
+ for (Object child : provider.getChildren(element)) {
if (child instanceof RefactoringHistoryNode)
getCoveredDescriptors(child, set);
}
@@ -619,8 +615,7 @@
Assert.isNotNull(selection);
fSelectedDescriptors.clear();
final Object[] elements= selection.toArray();
- for (int index= 0; index < elements.length; index++) {
- final Object element= elements[index];
+ for (Object element : elements) {
if (element instanceof RefactoringHistoryEntry) {
final RefactoringHistoryEntry entry= (RefactoringHistoryEntry) element;
final RefactoringDescriptorProxy proxy= entry.getDescriptor();
@@ -717,9 +712,9 @@
handleCheckStateChanged();
final Object[] roots= provider.getRootElements();
if (roots != null) {
- for (int index= 0; index < roots.length; index++) {
- if (!(roots[index] instanceof RefactoringHistoryEntry)) {
- fHistoryViewer.setExpandedState(roots[index], true);
+ for (Object root : roots) {
+ if (!(root instanceof RefactoringHistoryEntry)) {
+ fHistoryViewer.setExpandedState(root, true);
return;
}
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryEditHelper.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryEditHelper.java
index cc53ac4..ed3a1f1 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryEditHelper.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/history/RefactoringHistoryEditHelper.java
@@ -76,8 +76,8 @@
*/
private static IProject[] getAffectedProjects(final RefactoringDescriptorProxy[] descriptors) {
final Set<String> set= new HashSet<>();
- for (int index= 0; index < descriptors.length; index++) {
- final String project= descriptors[index].getProject();
+ for (RefactoringDescriptorProxy descriptor : descriptors) {
+ final String project= descriptor.getProject();
if (project == null || "".equals(project)) //$NON-NLS-1$
return null;
set.add(project);
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java
index 6d25307..b2f939a 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java
@@ -455,9 +455,7 @@
if (fDefaultPageTitle == null)
return;
- IWizardPage[] pages= getPages();
- for (int i= 0; i < pages.length; i++) {
- IWizardPage page= pages[i];
+ for (IWizardPage page : getPages()) {
if (page.getTitle() == null)
page.setTitle(fDefaultPageTitle);
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/TextEditChangeNode.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/TextEditChangeNode.java
index b08df14..04bc0c5 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/TextEditChangeNode.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/TextEditChangeNode.java
@@ -170,9 +170,10 @@
private TextEditBasedChangeGroup[] getSortedChangeGroups(TextEditBasedChange change) {
TextEditBasedChangeGroup[] groups= change.getChangeGroups();
List<TextEditBasedChangeGroup> result= new ArrayList<>(groups.length);
- for (int i= 0; i < groups.length; i++) {
- if (!groups[i].getTextEditGroup().isEmpty())
- result.add(groups[i]);
+ for (TextEditBasedChangeGroup group : groups) {
+ if (!group.getTextEditGroup().isEmpty()) {
+ result.add(group);
+ }
}
Comparator<TextEditBasedChangeGroup> comparator= new OffsetComparator();
Collections.sort(result, comparator);
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryContentProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryContentProvider.java
index 18bf85e..7c2f86d 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryContentProvider.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/history/RefactoringHistoryContentProvider.java
@@ -295,8 +295,9 @@
private Object[] getRefactoringHistoryEntries(final RefactoringHistoryNode parent) {
final RefactoringDescriptorProxy[] proxies= getRefactoringDescriptorProxies();
final List<RefactoringHistoryEntry> list= new ArrayList<>(proxies.length);
- for (int index= 0; index < proxies.length; index++)
- list.add(new RefactoringHistoryEntry(parent, proxies[index]));
+ for (RefactoringDescriptorProxy proxy : proxies) {
+ list.add(new RefactoringHistoryEntry(parent, proxy));
+ }
return list.toArray();
}
@@ -499,8 +500,8 @@
final long[][] structure= getRefactoringRootStructure(proxies[0].getTimeStamp());
int begin= 0;
long end= Long.MAX_VALUE;
- for (int index= 0; index < proxies.length; index++) {
- final long stamp= proxies[index].getTimeStamp();
+ for (RefactoringDescriptorProxy proxy : proxies) {
+ final long stamp= proxy.getTimeStamp();
for (int offset= begin; offset < structure.length; offset++) {
final long start= structure[offset][0];
if (stamp >= start && stamp <= end) {
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractResourceMappingMerger.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractResourceMappingMerger.java
index a62d8e7..7eadaad 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractResourceMappingMerger.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/AbstractResourceMappingMerger.java
@@ -145,10 +145,9 @@
*/
private static IProject[] getAffectedProjects(final RefactoringHistory history) {
final Set<IProject> set= new HashSet<>();
- final RefactoringDescriptorProxy[] proxies= history.getDescriptors();
final IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
- for (int index= 0; index < proxies.length; index++) {
- final String name= proxies[index].getProject();
+ for (RefactoringDescriptorProxy proxy : history.getDescriptors()) {
+ final String name= proxy.getProject();
if (name != null && !"".equals(name)) //$NON-NLS-1$
set.add(root.getProject(name));
else
@@ -320,8 +319,7 @@
final Set<RefactoringDescriptor> result= new HashSet<>();
try {
monitor.beginTask(RefactoringUIMessages.RefactoringModelMerger_retrieving_refactorings, diffs.length * 2);
- for (int index= 0; index < diffs.length; index++) {
- final IDiff diff= diffs[index];
+ for (IDiff diff : diffs) {
if (diff instanceof IThreeWayDiff) {
final IThreeWayDiff threeWay= (IThreeWayDiff) diff;
final Set<RefactoringDescriptor> localDescriptors= new HashSet<>();
@@ -381,9 +379,9 @@
try {
stream= storage.getContents();
final RefactoringHistory history= RefactoringHistoryService.getInstance().readRefactoringHistory(stream, RefactoringDescriptor.MULTI_CHANGE);
- final RefactoringDescriptorProxy[] proxies= history.getDescriptors();
- for (int offset= 0; offset < proxies.length; offset++)
- descriptors.add(proxies[offset].requestDescriptor(null));
+ for (RefactoringDescriptorProxy proxy : history.getDescriptors()) {
+ descriptors.add(proxy.requestDescriptor(null));
+ }
} catch (CoreException exception) {
RefactoringUIPlugin.log(exception);
} finally {
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/RefactoringSynchronizationActionProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/RefactoringSynchronizationActionProvider.java
index 71b4612..f63d314 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/RefactoringSynchronizationActionProvider.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/RefactoringSynchronizationActionProvider.java
@@ -141,15 +141,14 @@
if (selection instanceof IStructuredSelection) {
final IStructuredSelection structured= (IStructuredSelection) selection;
if (!structured.isEmpty()) {
- final Object[] elements= structured.toArray();
final ISynchronizationScope scope= context.getScope();
- for (int index= 0; index < elements.length; index++) {
- if (elements[index] instanceof RefactoringHistory) {
- getRefactorings(scope, (RefactoringHistory) elements[index], set);
- } else if (elements[index] instanceof RefactoringDescriptorProxy) {
- getRefactoring(scope, (RefactoringDescriptorProxy) elements[index], set);
- } else if (elements[index] instanceof RefactoringDescriptor) {
- getRefactoring(scope, new RefactoringDescriptorProxyAdapter(((RefactoringDescriptor) elements[index])), set);
+ for (Object element : structured.toArray()) {
+ if (element instanceof RefactoringHistory) {
+ getRefactorings(scope, (RefactoringHistory) element, set);
+ } else if (element instanceof RefactoringDescriptorProxy) {
+ getRefactoring(scope, (RefactoringDescriptorProxy) element, set);
+ } else if (element instanceof RefactoringDescriptor) {
+ getRefactoring(scope, new RefactoringDescriptorProxyAdapter((RefactoringDescriptor) element), set);
}
}
}
@@ -216,15 +215,14 @@
if (selection instanceof IStructuredSelection) {
final IStructuredSelection structured= (IStructuredSelection) selection;
if (!structured.isEmpty()) {
- final Object[] elements= structured.toArray();
final ISynchronizationScope scope= context.getScope();
- for (int index= 0; index < elements.length; index++) {
- if (elements[index] instanceof RefactoringHistory) {
- return hasRefactorings(scope, (RefactoringHistory) elements[index]);
- } else if (elements[index] instanceof RefactoringDescriptorProxy) {
- return hasRefactoring(scope, (RefactoringDescriptorProxy) elements[index]);
- } else if (elements[index] instanceof RefactoringDescriptor) {
- return hasRefactoring(scope, new RefactoringDescriptorProxyAdapter((RefactoringDescriptor) elements[index]));
+ for (Object element : structured.toArray()) {
+ if (element instanceof RefactoringHistory) {
+ return hasRefactorings(scope, (RefactoringHistory) element);
+ } else if (element instanceof RefactoringDescriptorProxy) {
+ return hasRefactoring(scope, (RefactoringDescriptorProxy) element);
+ } else if (element instanceof RefactoringDescriptor) {
+ return hasRefactoring(scope, new RefactoringDescriptorProxyAdapter((RefactoringDescriptor) element));
}
}
}
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/resource/DeleteResourcesWizard.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/resource/DeleteResourcesWizard.java
index 0725978..79a0fb6 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/resource/DeleteResourcesWizard.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/resource/DeleteResourcesWizard.java
@@ -236,8 +236,8 @@
private void updateListOfProjects() {
IResource[] initialResources = fRefactoringProcessor.getResourcesToDelete();
StringBuilder buf= new StringBuilder();
- for (int i= 0; i < initialResources.length; i++) {
- String location= getLocation(initialResources[i]);
+ for (IResource initialResource : initialResources) {
+ String location= getLocation(initialResource);
if (location != null) {
if (buf.length() > 0)
buf.append('\n');
@@ -269,8 +269,7 @@
}
private boolean containsLinkedResource(IResource[] resources) {
- for (int i = 0; i < resources.length; i++) {
- IResource resource = resources[i];
+ for (IResource resource : resources) {
if (resource != null && resource.isLinked()) { // paranoia code, can not be null
return true;
}
