diff options
| author | Carsten Hammer | 2019-06-20 17:36:58 +0000 |
|---|---|---|
| committer | Jeff Johnston | 2019-12-19 16:50:03 +0000 |
| commit | 63fee998846cdaf2e9aca41c0e63184edb058d5e (patch) | |
| tree | 5344a9f4d34b0381b2fa42e8d2f6327aeeb4e277 | |
| parent | bdac3bc2697120fd1457b41f7c2ab83ab43f1bc1 (diff) | |
| download | eclipse.jdt.ui-63fee998846cdaf2e9aca41c0e63184edb058d5e.tar.gz eclipse.jdt.ui-63fee998846cdaf2e9aca41c0e63184edb058d5e.tar.xz eclipse.jdt.ui-63fee998846cdaf2e9aca41c0e63184edb058d5e.zip | |
Bug 548309 - Use jdk 5 for-each loop (org.eclipse.jdt.ui)I20191220-1805
ui refactoring
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: I8a453ebf5a7f3328686c39025cee96492ba5e5c3
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
43 files changed, 281 insertions, 334 deletions
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionsControl.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionsControl.java index 2bc3e7519d..316f87706e 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionsControl.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionsControl.java @@ -14,7 +14,6 @@ package org.eclipse.jdt.internal.ui.refactoring; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.eclipse.swt.SWT; @@ -55,6 +54,7 @@ import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jdt.core.search.IJavaSearchScope; import org.eclipse.jdt.core.search.SearchEngine; +import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels; import org.eclipse.jdt.internal.corext.refactoring.ExceptionInfo; import org.eclipse.jdt.internal.ui.JavaPlugin; @@ -63,7 +63,6 @@ import org.eclipse.jdt.internal.ui.JavaUIStatus; import org.eclipse.jdt.internal.ui.dialogs.FilteredTypesSelectionDialog; import org.eclipse.jdt.internal.ui.dialogs.StatusInfo; import org.eclipse.jdt.internal.ui.util.SWTUtil; -import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels; /** * A special control to add and remove thrown exceptions. @@ -79,8 +78,7 @@ public class ChangeExceptionsControl extends Composite { } private ExceptionInfo[] removeMarkedAsDeleted(List<ExceptionInfo> exceptionInfos){ List<ExceptionInfo> result= new ArrayList<>(exceptionInfos.size()); - for (Iterator<ExceptionInfo> iter= exceptionInfos.iterator(); iter.hasNext();) { - ExceptionInfo info= iter.next(); + for (ExceptionInfo info : exceptionInfos) { if (! info.isDeleted()) result.add(info); } @@ -292,8 +290,7 @@ public class ChangeExceptionsControl extends Composite { } private ExceptionInfo findExceptionInfo(IType exception) { - for (Iterator<ExceptionInfo> iter= fExceptionInfos.iterator(); iter.hasNext(); ) { - ExceptionInfo info= iter.next(); + for (ExceptionInfo info : fExceptionInfos) { if (info.getElement().equals(exception)) return info; } @@ -309,12 +306,12 @@ public class ChangeExceptionsControl extends Composite { @Override public void widgetSelected(SelectionEvent e) { int index= getTable().getSelectionIndices()[0]; - ExceptionInfo[] selected= getSelectedItems(); - for (int i= 0; i < selected.length; i++) { - if (selected[i].isAdded()) - fExceptionInfos.remove(selected[i]); - else - selected[i].markAsDeleted(); + for (ExceptionInfo s : getSelectedItems()) { + if (s.isAdded()) { + fExceptionInfos.remove(s); + } else { + s.markAsDeleted(); + } } restoreSelection(index); } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java index 21d558f1ab..13062823a5 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java @@ -108,8 +108,7 @@ public class ChangeParametersControl extends Composite { } private ParameterInfo[] removeMarkedAsDeleted(List<ParameterInfo> paramInfos){ List<ParameterInfo> result= new ArrayList<>(paramInfos.size()); - for (Iterator<ParameterInfo> iter= paramInfos.iterator(); iter.hasNext();) { - ParameterInfo info= iter.next(); + for (ParameterInfo info : paramInfos) { if (! info.isDeleted()) result.add(info); } @@ -536,12 +535,12 @@ public class ChangeParametersControl extends Composite { @Override public void widgetSelected(SelectionEvent e) { int index= getTable().getSelectionIndices()[0]; - ParameterInfo[] selected= getSelectedElements(); - for (int i= 0; i < selected.length; i++) { - if (selected[i].isAdded()) - fParameterInfos.remove(selected[i]); - else - selected[i].markAsDeleted(); + for (ParameterInfo s : getSelectedElements()) { + if (s.isAdded()) { + fParameterInfos.remove(s); + } else { + s.markAsDeleted(); + } } restoreSelection(index); } @@ -684,8 +683,7 @@ public class ChangeParametersControl extends Composite { List<ParameterInfo> res= new ArrayList<>(elements.size()); List<ParameterInfo> deleted= new ArrayList<>(); ParameterInfo floating= null; - for (Iterator<ParameterInfo> iter= elements.iterator(); iter.hasNext();) { - ParameterInfo curr= iter.next(); + for (ParameterInfo curr : elements) { if (move.contains(curr)) { res.add(curr); } else if (curr.isDeleted()) { @@ -725,8 +723,7 @@ public class ChangeParametersControl extends Composite { if (fParameterInfos == null) // during initialization return 0; int result= 0; - for (Iterator<ParameterInfo> iter= fParameterInfos.iterator(); iter.hasNext();) { - ParameterInfo info= iter.next(); + for (ParameterInfo info : fParameterInfos) { if (! info.isDeleted()) result++; } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java index 6c955d0818..b41f37c530 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java @@ -251,11 +251,13 @@ public class ChangeTypeWizard extends RefactoringWizard { } private TreeItem findItem(TreeItem[] items, ITypeBinding type){ - for (int i=0; i < items.length; i++){ - if (items[i].getData().equals(type)) return items[i]; + for (TreeItem item : items) { + if (item.getData().equals(type)) { + return item; + } } - for (int i=0; i < items.length; i++){ - TreeItem item= findItem(items[i].getItems(), type); + for (TreeItem ti : items) { + TreeItem item= findItem(ti.getItems(), type); if (item != null) return item; } return null; diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java index 745a7ea894..8b6c8e76f2 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java @@ -74,8 +74,8 @@ class ComboSelectionDialog extends Dialog{ final Combo combo= new Combo(innerComposite, SWT.READ_ONLY); SWTUtil.setDefaultVisibleItemCount(combo); - for (int i = 0; i < fAllowedStrings.length; i++) { - combo.add(fAllowedStrings[i]); + for (String allowedString : fAllowedStrings) { + combo.add(allowedString); } combo.select(fInitialSelectionIndex); fSelection= combo.getItem(combo.getSelectionIndex()); @@ -94,8 +94,8 @@ class ComboSelectionDialog extends Dialog{ private int getMaxStringLength() { int max= 0; - for (int i= 0; i < fAllowedStrings.length; i++) { - max= Math.max(max, fAllowedStrings[i].length()); + for (String allowedString : fAllowedStrings) { + max= Math.max(max, allowedString.length()); } return max; } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/CompilationUnitChangeNode.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/CompilationUnitChangeNode.java index d38a598480..8656428cc9 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/CompilationUnitChangeNode.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/CompilationUnitChangeNode.java @@ -101,9 +101,7 @@ public class CompilationUnitChangeNode extends TextEditChangeNode { if (cunit != null) { List<ChildNode> children= new ArrayList<>(5); Map<IJavaElement, JavaLanguageNode> map= new HashMap<>(20); - TextEditBasedChangeGroup[] changes= getSortedChangeGroups(change); - for (int i= 0; i < changes.length; i++) { - TextEditBasedChangeGroup tec= changes[i]; + for (TextEditBasedChangeGroup tec : getSortedChangeGroups(change)) { try { IJavaElement element= getModifiedJavaElement(tec, cunit); if (element.equals(cunit)) { @@ -142,9 +140,10 @@ public class CompilationUnitChangeNode extends TextEditChangeNode { private TextEditBasedChangeGroup[] getSortedChangeGroups(TextEditBasedChange change) { TextEditBasedChangeGroup[] edits= change.getChangeGroups(); List<TextEditBasedChangeGroup> result= new ArrayList<>(edits.length); - for (int i= 0; i < edits.length; i++) { - if (!edits[i].getTextEditGroup().isEmpty()) - result.add(edits[i]); + for (TextEditBasedChangeGroup edit : edits) { + if (!edit.getTextEditGroup().isEmpty()) { + result.add(edit); + } } Comparator<TextEditBasedChangeGroup> comparator= new OffsetComparator(); Collections.sort(result, comparator); @@ -199,15 +198,13 @@ public class CompilationUnitChangeNode extends TextEditChangeNode { return false; int sOffset= sourceRegion.getOffset(); int sEnd= sOffset + sLength - 1; - TextEdit[] edits= group.getTextEdits(); - for (int i= 0; i < edits.length; i++) { - TextEdit edit= edits[i]; + for (TextEdit edit : group.getTextEdits()) { if (edit.isDeleted()) return false; int rOffset= edit.getOffset(); int rLength= edit.getLength(); int rEnd= rOffset + rLength - 1; - if (rLength == 0) { + if (rLength == 0) { if (!(sOffset < rOffset && rOffset <= sEnd)) return false; } else { diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractClassWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractClassWizard.java index daef2f63f7..d01bec0199 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractClassWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractClassWizard.java @@ -273,8 +273,7 @@ public class ExtractClassWizard extends RefactoringWizard { table.setLayoutData(gridData); Field[] fields= fDescriptor.getFields(); tv.setInput(fields); - for (int i= 0; i < fields.length; i++) { - Field field= fields[i]; + for (Field field : fields) { tv.setChecked(field, field.isCreateField()); } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java index b7c158e5d7..bfaee05877 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java @@ -243,9 +243,10 @@ public class ExtractInterfaceWizard extends RefactoringWizard { } private static boolean containsMethods(IMember[] members) { - for (int i= 0; i < members.length; i++) { - if (members[i].getElementType() == IJavaElement.METHOD) + for (IMember member : members) { + if (member.getElementType() == IJavaElement.METHOD) { return true; + } } return false; } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java index 8a93077d91..284987d324 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java @@ -316,8 +316,8 @@ public final class ExtractSupertypeMemberPage extends PullUpMemberPage { if (result == Window.OK) { final Object[] objects= dialog.getResult(); if (objects != null && objects.length > 0) { - for (int index= 0; index < objects.length; index++) { - fTypesToExtract.add((IType) objects[index]); + for (Object object : objects) { + fTypesToExtract.add((IType) object); } fTableViewer.setInput(fTypesToExtract.toArray()); handleTypesChanged(); diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java index 49d149defa..c48515046e 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java @@ -16,7 +16,6 @@ package org.eclipse.jdt.internal.ui.refactoring; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -72,6 +71,7 @@ import org.eclipse.jdt.core.JavaConventions; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels; import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo; import org.eclipse.jdt.internal.corext.refactoring.structure.ChangeSignatureProcessor; import org.eclipse.jdt.internal.corext.refactoring.structure.IntroduceParameterObjectProcessor; @@ -83,7 +83,6 @@ import org.eclipse.jdt.ui.JavaElementLabels; import org.eclipse.jdt.internal.ui.javaeditor.JavaSourceViewer; import org.eclipse.jdt.internal.ui.util.ExceptionHandler; import org.eclipse.jdt.internal.ui.util.SWTUtil; -import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels; public class IntroduceParameterObjectWizard extends RefactoringWizard { @@ -121,8 +120,7 @@ public class IntroduceParameterObjectWizard extends RefactoringWizard { IntroduceParameterObjectProcessor refactoring= (IntroduceParameterObjectProcessor) inputElement; List<ParameterInfo> parameterInfos= refactoring.getParameterInfos(); List<ParameterInfo> result= new ArrayList<>(parameterInfos.size()); - for (Iterator<ParameterInfo> iter= parameterInfos.iterator(); iter.hasNext();) { - ParameterInfo pi= iter.next(); + for (ParameterInfo pi : parameterInfos) { if (!pi.isAdded()) result.add(pi); } @@ -252,9 +250,7 @@ public class IntroduceParameterObjectWizard extends RefactoringWizard { IJavaProject project= fProcessor.getMethod().getJavaProject(); String sourceLevel= project.getOption(JavaCore.COMPILER_SOURCE, true); String compliance= project.getOption(JavaCore.COMPILER_COMPLIANCE, true); - List<ParameterInfo> parameterInfos= fProcessor.getParameterInfos(); - for (Iterator<ParameterInfo> iter= parameterInfos.iterator(); iter.hasNext();) { - ParameterInfo pi= iter.next(); + for (ParameterInfo pi : fProcessor.getParameterInfos()) { if (names.contains(pi.getNewName())) { setErrorMessage(Messages.format(RefactoringMessages.IntroduceParameterObjectWizard_parametername_check_notunique, BasicElementLabels.getJavaElementName(pi.getNewName()))); setPageComplete(false); @@ -440,8 +436,7 @@ public class IntroduceParameterObjectWizard extends RefactoringWizard { table.setLayoutData(gridData); tv.setInput(fProcessor); List<ParameterInfo> parameterInfos= fProcessor.getParameterInfos(); - for (Iterator<ParameterInfo> iter= parameterInfos.iterator(); iter.hasNext();) { - ParameterInfo pi= iter.next(); + for (ParameterInfo pi : parameterInfos) { tv.setChecked(pi, pi.isCreateField()); } tv.refresh(true); diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodWizard.java index c1ee53875a..12846c8ac9 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodWizard.java @@ -162,10 +162,9 @@ public final class MoveInstanceMethodWizard extends RefactoringWizard { final Object element= ((IStructuredSelection) event.getSelection()).getFirstElement(); if (element instanceof IVariableBinding) { final IVariableBinding target= (IVariableBinding) element; - final IVariableBinding[] targets= fProcessor.getPossibleTargets(); boolean success= false; - for (int index= 0; index < targets.length; index++) { - if (Bindings.equals(target, targets[index])) { + for (IVariableBinding v : fProcessor.getPossibleTargets()) { + if (Bindings.equals(target, v)) { handleTargetChanged(target); success= true; break; diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java index dec3226fd0..560d778e60 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java @@ -183,8 +183,7 @@ public class ParameterEditDialog extends StatusDialog { result[1]= validateName(); result[2]= validateType(); } - for (int i= 0; i < result.length; i++) { - IStatus status= result[i]; + for (IStatus status : result) { if (status != null && !status.isOK()) { updateStatus(status); return; diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempWizard.java index 0da35768c2..46444786fb 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempWizard.java @@ -164,8 +164,8 @@ public class PromoteTempWizard extends RefactoringWizard { private void updateButtonsEnablement() { fDeclareFinalCheckbox.setEnabled(getPromoteTempRefactoring().canEnableSettingFinal()); fDeclareStaticCheckbox.setEnabled(getPromoteTempRefactoring().canEnableSettingStatic()); - for (int i= 0; i < fInitializeInRadioButtons.length; i++) { - fInitializeInRadioButtons[i].setEnabled(canEnable(getDataAsInt(fInitializeInRadioButtons[i]))); + for (Button initializeInRadioButton : fInitializeInRadioButtons) { + initializeInRadioButton.setEnabled(canEnable(getDataAsInt(initializeInRadioButton))); } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullPushCheckboxTableViewer.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullPushCheckboxTableViewer.java index 13a825456c..588d430c11 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullPushCheckboxTableViewer.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullPushCheckboxTableViewer.java @@ -55,8 +55,7 @@ class PullPushCheckboxTableViewer extends CheckboxTableViewer{ private void setCheckState(IMemberActionInfo[] infos) { if (infos == null) return; - for (int i= 0; i < infos.length; i++) { - IMemberActionInfo info= infos[i]; + for (IMemberActionInfo info : infos) { setChecked(info, PullPushCheckboxTableViewer.getCheckState(info)); } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java index a50682c573..eed83cf22f 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java @@ -290,8 +290,7 @@ public class PullUpMemberPage extends UserInputWizardPage { private static int getEditableCount(final MemberActionInfo[] infos) { int result= 0; - for (int i= 0; i < infos.length; i++) { - final MemberActionInfo info= infos[i]; + for (PullUpMemberPage.MemberActionInfo info : infos) { if (info.isEditable()) result++; } @@ -303,8 +302,8 @@ public class PullUpMemberPage extends UserInputWizardPage { } private static void setActionForInfos(final MemberActionInfo[] infos, final int action) { - for (int i= 0; i < infos.length; i++) { - infos[i].setAction(action); + for (PullUpMemberPage.MemberActionInfo info : infos) { + info.setAction(action); } } @@ -680,8 +679,8 @@ public class PullUpMemberPage extends UserInputWizardPage { fSuperTypesCombo= new Combo(parent, SWT.READ_ONLY); SWTUtil.setDefaultVisibleItemCount(fSuperTypesCombo); if (fCandidateTypes.length > 0) { - for (int i= 0; i < fCandidateTypes.length; i++) { - final String comboLabel= fCandidateTypes[i].getFullyQualifiedName('.'); + for (IType candidateType : fCandidateTypes) { + final String comboLabel= candidateType.getFullyQualifiedName('.'); fSuperTypesCombo.add(comboLabel); } fSuperTypesCombo.select(fCandidateTypes.length - 1); @@ -755,8 +754,7 @@ public class PullUpMemberPage extends UserInputWizardPage { private MemberActionInfo[] getActiveInfos() { final MemberActionInfo[] infos= getTableInput(); final List<MemberActionInfo> result= new ArrayList<>(infos.length); - for (int i= 0; i < infos.length; i++) { - final MemberActionInfo info= infos[i]; + for (PullUpMemberPage.MemberActionInfo info : infos) { if (info.isActive()) result.add(info); } @@ -769,9 +767,10 @@ public class PullUpMemberPage extends UserInputWizardPage { return -1; final int code= infos[0].getAction(); - for (int i= 0; i < infos.length; i++) { - if (code != infos[i].getAction()) + for (PullUpMemberPage.MemberActionInfo info : infos) { + if (code != info.getAction()) { return -1; + } } return code; } @@ -816,8 +815,8 @@ public class PullUpMemberPage extends UserInputWizardPage { private IMember[] getMembers() { final MemberActionInfo[] infos= getTableInput(); final List<IMember> result= new ArrayList<>(infos.length); - for (int index= 0; index < infos.length; index++) { - result.add(infos[index].getMember()); + for (PullUpMemberPage.MemberActionInfo info : infos) { + result.add(info.getMember()); } return result.toArray(new IMember[result.size()]); } @@ -836,9 +835,7 @@ public class PullUpMemberPage extends UserInputWizardPage { private void getMembersForAction(int action, boolean onlyMethods, List<IMember> result) { boolean isDestinationInterface= isDestinationInterface(); - final MemberActionInfo[] infos= getTableInput(); - for (int index= 0; index < infos.length; index++) { - MemberActionInfo info= infos[index]; + for (PullUpMemberPage.MemberActionInfo info : getTableInput()) { int infoAction= info.getAction(); boolean isMethodInfo= info.isMethodInfo(); if (!isMethodInfo && onlyMethods) @@ -947,10 +944,11 @@ public class PullUpMemberPage extends UserInputWizardPage { private void setActionForMembers(final IMember[] members, final int action) { final MemberActionInfo[] infos= getTableInput(); - for (int i= 0; i < members.length; i++) { - for (int j= 0; j < infos.length; j++) { - if (infos[j].getMember().equals(members[i])) - infos[j].setAction(action); + for (IMember member : members) { + for (PullUpMemberPage.MemberActionInfo info : infos) { + if (info.getMember().equals(member)) { + info.setAction(action); + } } } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java index 16caf6c920..4dbedac603 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java @@ -99,10 +99,10 @@ public class PullUpMethodPage extends UserInputWizardPage { private static class PullUpFilter extends ViewerFilter { private static boolean anySubtypeCanBeShown(final IType type, final Map<IType, IMember[]> typeToMemberArray, final ITypeHierarchy hierarchy) { - final IType[] subTypes= hierarchy.getSubtypes(type); - for (int i= 0; i < subTypes.length; i++) { - if (canBeShown(subTypes[i], typeToMemberArray, hierarchy)) + for (IType subType : hierarchy.getSubtypes(type)) { + if (canBeShown(subType, typeToMemberArray, hierarchy)) { return true; + } } return false; } @@ -115,9 +115,7 @@ public class PullUpMethodPage extends UserInputWizardPage { private static Set<IType> computeShowableSubtypesOfMainType(final ITypeHierarchy hierarchy, final Map<IType, IMember[]> typeToMemberArray) { final Set<IType> result= new HashSet<>(); - final IType[] subtypes= hierarchy.getAllSubtypes(hierarchy.getType()); - for (int i= 0; i < subtypes.length; i++) { - final IType subtype= subtypes[i]; + for (IType subtype : hierarchy.getAllSubtypes(hierarchy.getType())) { if (canBeShown(subtype, typeToMemberArray, hierarchy)) result.add(subtype); } @@ -246,8 +244,7 @@ public class PullUpMethodPage extends UserInputWizardPage { // IType -> Set of IMember private static Map<IType, HashSet<IMember>> createTypeToMemberSetMapping(final IMember[] members) { final Map<IType, HashSet<IMember>> typeToMemberSet= new HashMap<>(); - for (int i= 0; i < members.length; i++) { - final IMember member= members[i]; + for (IMember member : members) { final IType type= member.getDeclaringType(); if (!typeToMemberSet.containsKey(type)) typeToMemberSet.put(type, new HashSet<IMember>()); @@ -436,9 +433,10 @@ public class PullUpMethodPage extends UserInputWizardPage { private IMethod[] getCheckedMethods() { final Object[] checked= fTreeViewer.getCheckedElements(); final List<IMethod> members= new ArrayList<>(checked.length); - for (int i= 0; i < checked.length; i++) { - if (checked[i] instanceof IMethod) - members.add((IMethod) checked[i]); + for (Object c : checked) { + if (c instanceof IMethod) { + members.add((IMethod) c); + } } return members.toArray(new IMethod[members.size()]); } @@ -521,16 +519,14 @@ public class PullUpMethodPage extends UserInputWizardPage { } private void precheckElements(final ContainerCheckedTreeViewer treeViewer) { - final IMember[] members= fProcessor.getMembersToMove(); - for (int i= 0; i < members.length; i++) { - treeViewer.setChecked(members[i], true); + for (IMember member : fProcessor.getMembersToMove()) { + treeViewer.setChecked(member, true); } } private void removeAllTreeViewFilters() { - final ViewerFilter[] filters= fTreeViewer.getFilters(); - for (int i= 0; i < filters.length; i++) { - fTreeViewer.removeFilter(filters[i]); + for (ViewerFilter filter : fTreeViewer.getFilters()) { + fTreeViewer.removeFilter(filter); } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java index f67b15434c..05babf4c5c 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java @@ -200,16 +200,17 @@ public final class PushDownWizard extends RefactoringWizard { private static int countEditableInfos(final MemberActionInfo[] infos) { int result= 0; - for (int index= 0; index < infos.length; index++) { - if (infos[index].isEditable()) + for (MemberActionInfo info : infos) { + if (info.isEditable()) { result++; + } } return result; } private static void setInfoAction(final MemberActionInfo[] infos, final int action) { - for (int index= 0; index < infos.length; index++) { - infos[index].setAction(action); + for (MemberActionInfo info : infos) { + info.setAction(action); } } @@ -250,10 +251,8 @@ public final class PushDownWizard extends RefactoringWizard { } private int countInfosForAction(final int action) { - final MemberActionInfo[] infos= (MemberActionInfo[]) fTableViewer.getInput(); int count= 0; - for (int index= 0; index < infos.length; index++) { - final MemberActionInfo info= infos[index]; + for (MemberActionInfo info : (MemberActionInfo[]) fTableViewer.getInput()) { if (info.getAction() == action) count++; } @@ -471,8 +470,7 @@ public final class PushDownWizard extends RefactoringWizard { private MemberActionInfo[] getActiveInfos() { final MemberActionInfo[] infos= fProcessor.getMemberActionInfos(); final List<MemberActionInfo> result= new ArrayList<>(infos.length); - for (int index= 0; index < infos.length; index++) { - final MemberActionInfo info= infos[index]; + for (MemberActionInfo info : infos) { if (info.isActive()) result.add(info); } @@ -485,9 +483,10 @@ public final class PushDownWizard extends RefactoringWizard { return -1; final int code= infos[0].getAction(); - for (int index= 0; index < infos.length; index++) { - if (code != infos[index].getAction()) + for (MemberActionInfo info : infos) { + if (code != info.getAction()) { return -1; + } } return code; } @@ -513,8 +512,8 @@ public final class PushDownWizard extends RefactoringWizard { private IMember[] getMembers() { final MemberActionInfo[] infos= (MemberActionInfo[]) fTableViewer.getInput(); final List<IMember> result= new ArrayList<>(infos.length); - for (int index= 0; index < infos.length; index++) { - result.add(infos[index].getMember()); + for (MemberActionInfo info : infos) { + result.add(info.getMember()); } return result.toArray(new IMember[result.size()]); } @@ -550,10 +549,11 @@ public final class PushDownWizard extends RefactoringWizard { private void setActionForMembers(final IMember[] members, final int action) { final MemberActionInfo[] infos= (MemberActionInfo[]) fTableViewer.getInput(); - for (int offset= 0; offset < members.length; offset++) { - for (int index= 0; index < infos.length; index++) { - if (infos[index].getMember().equals(members[offset])) - infos[index].setAction(action); + for (IMember member : members) { + for (MemberActionInfo info : infos) { + if (info.getMember().equals(member)) { + info.setAction(action); + } } } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/QualifiedNameComponent.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/QualifiedNameComponent.java index f128d4d124..06cf274ce8 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/QualifiedNameComponent.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/QualifiedNameComponent.java @@ -67,9 +67,8 @@ public class QualifiedNameComponent extends Composite { @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); - Control[] children= getChildren(); - for (int i= 0; i < children.length; i++) { - children[i].setEnabled(enabled); + for (Control child : getChildren()) { + child.setEnabled(enabled); } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/MoveStaticMembersAction.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/MoveStaticMembersAction.java index 94c6683d88..dde669d293 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/MoveStaticMembersAction.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/MoveStaticMembersAction.java @@ -95,9 +95,10 @@ public class MoveStaticMembersAction extends SelectionDispatchAction{ public void run(IStructuredSelection selection) { try { IMember[] members= getSelectedMembers(selection); - for (int index= 0; index < members.length; index++) { - if (!ActionUtil.isEditable(getShell(), members[index])) + for (IMember member : members) { + if (!ActionUtil.isEditable(getShell(), member)) { return; + } } if (RefactoringAvailabilityTester.isMoveStaticMembersAvailable(members)) RefactoringExecutionStarter.startMoveStaticMembersRefactoring(members, getShell()); diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/binary/BinaryRefactoringHistoryWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/binary/BinaryRefactoringHistoryWizard.java index 485b2a3dec..6960fa3fda 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/binary/BinaryRefactoringHistoryWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/binary/BinaryRefactoringHistoryWizard.java @@ -143,13 +143,12 @@ public abstract class BinaryRefactoringHistoryWizard extends RefactoringHistoryW final IProgressMonitor subMonitor= new SubProgressMonitor(monitor, 100, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL); try { subMonitor.beginTask(JarImportMessages.JarImportWizard_prepare_import, projects.length * 100); - for (int index= 0; index < projects.length; index++) { - final IPackageFragmentRoot[] roots= projects[index].getPackageFragmentRoots(); + for (IJavaProject project : projects) { + final IPackageFragmentRoot[] roots= project.getPackageFragmentRoots(); final IProgressMonitor subsubMonitor= new SubProgressMonitor(subMonitor, 100, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL); try { subsubMonitor.beginTask(JarImportMessages.JarImportWizard_prepare_import, roots.length); - for (int offset= 0; offset < roots.length; offset++) { - final IPackageFragmentRoot current= roots[offset]; + for (IPackageFragmentRoot current : roots) { if (!current.equals(root) && current.getKind() == IPackageFragmentRoot.K_BINARY) { final IClasspathEntry entry= current.getRawClasspathEntry(); if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) { @@ -381,8 +380,8 @@ public abstract class BinaryRefactoringHistoryWizard extends RefactoringHistoryW if (!canUseSourceAttachment()) { final RefactoringDescriptorProxy[] proxies= getRefactoringHistory().getDescriptors(); monitor.beginTask(JarImportMessages.JarImportWizard_prepare_import, proxies.length * 100); - for (int index= 0; index < proxies.length; index++) { - final RefactoringDescriptor descriptor= proxies[index].requestDescriptor(new SubProgressMonitor(monitor, 100, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL)); + for (RefactoringDescriptorProxy proxy : proxies) { + final RefactoringDescriptor descriptor= proxy.requestDescriptor(new SubProgressMonitor(monitor, 100, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL)); if (descriptor != null) { final int flags= descriptor.getFlags(); if ((flags & JavaRefactoringDescriptor.JAR_SOURCE_ATTACHMENT) != 0) @@ -417,8 +416,7 @@ public abstract class BinaryRefactoringHistoryWizard extends RefactoringHistoryW final List<IPackageFragment> list= new ArrayList<>(elements.length); try { subMonitor.beginTask(JarImportMessages.JarImportWizard_prepare_import, elements.length); - for (int index= 0; index < elements.length; index++) { - final IJavaElement element= elements[index]; + for (IJavaElement element : elements) { if (!fProcessedFragments.contains(element) && !element.getElementName().equals(META_INF_FRAGMENT)) list.add((IPackageFragment) element); subMonitor.worked(1); diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java index e137366127..8309e37311 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java @@ -15,9 +15,6 @@ *******************************************************************************/ package org.eclipse.jdt.internal.ui.refactoring.code; -import java.util.Iterator; -import java.util.List; - import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -47,6 +44,7 @@ import org.eclipse.jdt.core.dom.ClassInstanceCreation; import org.eclipse.jdt.core.dom.EnumConstantDeclaration; import org.eclipse.jdt.core.dom.Modifier; +import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels; import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo; import org.eclipse.jdt.internal.corext.refactoring.code.ExtractMethodRefactoring; @@ -63,7 +61,6 @@ import org.eclipse.jdt.internal.ui.refactoring.InputPageUtil; import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages; import org.eclipse.jdt.internal.ui.util.RowLayouter; import org.eclipse.jdt.internal.ui.util.SWTUtil; -import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels; public class ExtractMethodInputPage extends UserInputWizardPage { @@ -123,8 +120,7 @@ public class ExtractMethodInputPage extends UserInputWizardPage { label.setText(RefactoringMessages.ExtractMethodInputPage_destination_type); final Combo combo= new Combo(result, SWT.READ_ONLY | SWT.DROP_DOWN); SWTUtil.setDefaultVisibleItemCount(combo); - for (int i= 0; i < destinations.length; i++) { - ASTNode declaration= destinations[i]; + for (ASTNode declaration : destinations) { combo.add(getLabel(declaration)); } combo.select(0); @@ -262,24 +258,24 @@ public class ExtractMethodInputPage extends UserInputWizardPage { if (fRefactoring.isDestinationInterface()) { Integer visibility= Integer.valueOf(Modifier.PUBLIC); fRefactoring.setVisibility(visibility.intValue()); - for (int i= 0; i < radioButtons.length; i++) { - radioButtons[i].setEnabled(false); - if (radioButtons[i].getData().equals(visibility)) { - ((Button) radioButtons[i]).setSelection(true); + for (Control radioButton : radioButtons) { + radioButton.setEnabled(false); + if (radioButton.getData().equals(visibility)) { + ((Button) radioButton).setSelection(true); } else { - ((Button) radioButtons[i]).setSelection(false); + ((Button) radioButton).setSelection(false); } } } else { final String accessModifier= fSettings.get(ACCESS_MODIFIER); Integer visibility= accessModifier != null ? Integer.valueOf(accessModifier) : Integer.valueOf(fRefactoring.getVisibility()); fRefactoring.setVisibility(visibility.intValue()); - for (int i= 0; i < radioButtons.length; i++) { - radioButtons[i].setEnabled(true); - if (radioButtons[i].getData().equals(visibility)) { - ((Button) radioButtons[i]).setSelection(true); + for (Control radioButton : radioButtons) { + radioButton.setEnabled(true); + if (radioButton.getData().equals(visibility)) { + ((Button) radioButton).setSelection(true); } else { - ((Button) radioButtons[i]).setSelection(false); + ((Button) radioButton).setSelection(false); } } } @@ -447,9 +443,7 @@ public class ExtractMethodInputPage extends UserInputWizardPage { private RefactoringStatus validateParameters() { RefactoringStatus result= new RefactoringStatus(); - List<ParameterInfo> parameters= fRefactoring.getParameterInfos(); - for (Iterator<ParameterInfo> iter= parameters.iterator(); iter.hasNext();) { - ParameterInfo info= iter.next(); + for (ParameterInfo info : fRefactoring.getParameterInfos()) { if ("".equals(info.getNewName())) { //$NON-NLS-1$ result.addFatalError(RefactoringMessages.ExtractMethodInputPage_validation_emptyParameterName); return result; diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/FieldNameProcessor.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/FieldNameProcessor.java index c4034b49c9..b1edef0e22 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/FieldNameProcessor.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/FieldNameProcessor.java @@ -123,8 +123,7 @@ public class FieldNameProcessor implements IContentAssistProcessor, ISubjectCont String prefix= input.substring(0, documentOffset); ImageDescriptor imageDescriptor= JavaElementImageProvider.getFieldImageDescriptor(false, fRefactoring.getVisibility()); Image image= fImageRegistry.get(imageDescriptor); - for (int i= 0; i < fFieldNameProposals.length; i++) { - String tempName= fFieldNameProposals[i]; + for (String tempName : fFieldNameProposals) { if (tempName.length() == 0 || ! tempName.startsWith(prefix)) continue; JavaCompletionProposal proposal= new JavaCompletionProposal(tempName, 0, input.length(), image, tempName, 0); diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaPackageCompletionProcessor.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaPackageCompletionProcessor.java index b1644db16d..f67b7cc8a9 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaPackageCompletionProcessor.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaPackageCompletionProcessor.java @@ -159,9 +159,8 @@ public class JavaPackageCompletionProcessor implements IContentAssistProcessor, Set<String> names= fPackageFragmentRoots.length > 1 ? new HashSet<>() : null; for (IPackageFragmentRoot packageFragmentRoot : fPackageFragmentRoots) { try { - IJavaElement[] packageFragments= packageFragmentRoot.getChildren(); - for (int i= 0; i < packageFragments.length; i++) { - IPackageFragment pack= (IPackageFragment) packageFragments[i]; + for (IJavaElement packageFragment : packageFragmentRoot.getChildren()) { + IPackageFragment pack= (IPackageFragment) packageFragment; String packName= pack.getElementName(); if (packName.length() == 0 || ! packName.startsWith(prefix)) continue; diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaPackageFragmentRootCompletionProcessor.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaPackageFragmentRootCompletionProcessor.java index 06d3982d8d..bd95900af5 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaPackageFragmentRootCompletionProcessor.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaPackageFragmentRootCompletionProcessor.java @@ -139,9 +139,8 @@ public class JavaPackageFragmentRootCompletionProcessor implements IContentAssis ArrayList<JavaCompletionProposal> proposals= new ArrayList<>(); String prefix= input.substring(0, documentOffset); try { - IJavaElement[] packageFragments= fPackageFragmentRoot.getChildren(); - for (int i= 0; i < packageFragments.length; i++) { - IPackageFragment pack= (IPackageFragment) packageFragments[i]; + for (IJavaElement packageFragment : fPackageFragmentRoot.getChildren()) { + IPackageFragment pack= (IPackageFragment) packageFragment; String packName= pack.getElementName(); if (packName.length() == 0 || ! packName.startsWith(prefix)) continue; diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaSourcePackageFragmentRootCompletionProcessor.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaSourcePackageFragmentRootCompletionProcessor.java index 0dcc708771..9c58069126 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaSourcePackageFragmentRootCompletionProcessor.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/JavaSourcePackageFragmentRootCompletionProcessor.java @@ -120,12 +120,8 @@ public class JavaSourcePackageFragmentRootCompletionProcessor implements IConten private ICompletionProposal[] createSourcePackageFragmentRootProposals(String prefix, int replacementLength) { List<JavaCompletionProposal> proposals= new ArrayList<>(); try { - IJavaProject[] projects= fRoot.getJavaProjects(); - for (int i= 0; i < projects.length; i++) { - IJavaProject project= projects[i]; - IPackageFragmentRoot[] roots= project.getPackageFragmentRoots(); - for (int j= 0; j < roots.length; j++) { - IPackageFragmentRoot root= roots[j]; + for (IJavaProject project : fRoot.getJavaProjects()) { + for (IPackageFragmentRoot root : project.getPackageFragmentRoots()) { if (root.exists() && (root.getKind() == IPackageFragmentRoot.K_SOURCE)) { String name= root.getPath().toString(); if (name.length() > 1) { diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/VariableNamesProcessor.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/VariableNamesProcessor.java index 235bc0c017..46d2e267f2 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/VariableNamesProcessor.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/VariableNamesProcessor.java @@ -128,8 +128,7 @@ public class VariableNamesProcessor implements IContentAssistProcessor, ISubject ArrayList<JavaCompletionProposal> proposals= new ArrayList<>(); String prefix= input.substring(0, documentOffset); Image image= fImageRegistry.get(fProposalImageDescriptor); - for (int i= 0; i < fTempNameProposals.length; i++) { - String tempName= fTempNameProposals[i]; + for (String tempName : fTempNameProposals) { if (tempName.length() == 0 || ! tempName.startsWith(prefix)) continue; JavaCompletionProposal proposal= new JavaCompletionProposal(tempName, 0, input.length(), image, tempName, 0); diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java index 933d1eb028..508a9c280a 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java @@ -633,8 +633,7 @@ class ExternalizeWizardPage extends UserInputWizardPage { choices= loadAccessorDescriptions(); } - for (int i= 0; i < choices.length; i++) { - AccessorDescription curr= choices[i]; + for (AccessorDescription curr : choices) { if (!curr.equals(configured)) { currChoices.add(curr); currLabels.add(curr.getLabel()); @@ -788,8 +787,7 @@ class ExternalizeWizardPage extends UserInputWizardPage { } private void createDefaultExternalization(NLSSubstitution[] substitutions) { - for (int i= 0; i < substitutions.length; i++) { - NLSSubstitution substitution= substitutions[i]; + for (NLSSubstitution substitution : substitutions) { if (substitution.getState() == NLSSubstitution.INTERNALIZED) { substitution.setState(NLSSubstitution.EXTERNALIZED); substitution.generateKey(substitutions, getProperties(fNLSRefactoring.getPropertyFileHandle())); @@ -900,9 +898,10 @@ class ExternalizeWizardPage extends UserInputWizardPage { } private void checkInvalidKeys(RefactoringStatus status) { - for (int i= 0; i < fSubstitutions.length; i++) { - if (!isKeyValid(fSubstitutions[i], status)) + for (NLSSubstitution substitution : fSubstitutions) { + if (!isKeyValid(substitution, status)) { return; + } } } @@ -948,8 +947,7 @@ class ExternalizeWizardPage extends UserInputWizardPage { } private void checkDuplicateKeys(RefactoringStatus status) { - for (int i= 0; i < fSubstitutions.length; i++) { - NLSSubstitution substitution= fSubstitutions[i]; + for (NLSSubstitution substitution : fSubstitutions) { if (conflictingKeys(substitution)) { status.addFatalError(NLSUIMessages.ExternalizeWizardPage_warning_conflicting); return; @@ -958,8 +956,7 @@ class ExternalizeWizardPage extends UserInputWizardPage { } private void checkMissingKeys(RefactoringStatus status) { - for (int i= 0; i < fSubstitutions.length; i++) { - NLSSubstitution substitution= fSubstitutions[i]; + for (NLSSubstitution substitution : fSubstitutions) { if ((substitution.getValue() == null) && (substitution.getKey() != null)) { status.addWarning(NLSUIMessages.ExternalizeWizardPage_warning_keymissing); return; @@ -1018,12 +1015,11 @@ class ExternalizeWizardPage extends UserInputWizardPage { } private boolean hasNewOrMissingSubstitutions() { - for (int i= 0; i < fSubstitutions.length; i++) { - NLSSubstitution curr= fSubstitutions[i]; - if (curr.getInitialState() == NLSSubstitution.INTERNALIZED) { + for (NLSSubstitution substitution : fSubstitutions) { + if (substitution.getInitialState() == NLSSubstitution.INTERNALIZED) { return true; } - if (curr.getInitialState() == NLSSubstitution.EXTERNALIZED && curr.getInitialValue() == null) { + if (substitution.getInitialState() == NLSSubstitution.EXTERNALIZED && substitution.getInitialValue() == null) { return true; } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/NLSAccessorConfigurationDialog.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/NLSAccessorConfigurationDialog.java index 075d03c6b1..352b56ff3a 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/NLSAccessorConfigurationDialog.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/NLSAccessorConfigurationDialog.java @@ -276,10 +276,10 @@ public class NLSAccessorConfigurationDialog extends StatusDialog { if (fPkgFragment == null) return new Object[0]; List<Object> result= new ArrayList<>(1); - Object[] nonjava= fPkgFragment.getNonJavaResources(); - for (int i= 0; i < nonjava.length; i++) { - if (isPropertyFile(nonjava[i])) - result.add(nonjava[i]); + for (Object nonJava : fPkgFragment.getNonJavaResources()) { + if (isPropertyFile(nonJava)) { + result.add(nonJava); + } } return result.toArray(); diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/PackageBrowseAdapter.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/PackageBrowseAdapter.java index 735157bdaf..2db93eea8d 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/PackageBrowseAdapter.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/PackageBrowseAdapter.java @@ -68,12 +68,11 @@ public class PackageBrowseAdapter implements IStringButtonAdapter { public static Object[] createPackageListInput(ICompilationUnit cu, String elementNameMatch){ try{ IJavaProject project= cu.getJavaProject(); - IPackageFragmentRoot[] roots= project.getPackageFragmentRoots(); List<IPackageFragment> result= new ArrayList<>(); HashMap<String, Object> entered =new HashMap<>(); - for (int i= 0; i < roots.length; i++){ - if (canAddPackageRoot(roots[i])){ - getValidPackages(roots[i], result, entered, elementNameMatch); + for (IPackageFragmentRoot root : project.getPackageFragmentRoots()) { + if (canAddPackageRoot(root)) { + getValidPackages(root, result, entered, elementNameMatch); } } return result.toArray(); @@ -104,24 +103,22 @@ public class PackageBrowseAdapter implements IStringButtonAdapter { } catch (JavaModelException e){ return; } - for (int i= 0; i < children.length; i++){ - if (children[i] instanceof IPackageFragment) { - IPackageFragment packageFragment = (IPackageFragment)children[i]; - String packageName = packageFragment.getElementName(); - - if ((entered != null) && (entered.containsKey(packageName)) == true) { - continue; - } - - if (canAddPackage(packageFragment)) { - if ((elementNameMatch == null) || (elementNameMatch.equals(packageName))) { - result.add(packageFragment); - if (entered != null) { - entered.put(packageName, null); - } - } - } - } + for (IJavaElement child : children) { + if (child instanceof IPackageFragment) { + IPackageFragment packageFragment = (IPackageFragment) child; + String packageName = packageFragment.getElementName(); + if ((entered != null) && (entered.containsKey(packageName)) == true) { + continue; + } + if (canAddPackage(packageFragment)) { + if ((elementNameMatch == null) || (elementNameMatch.equals(packageName))) { + result.add(packageFragment); + if (entered != null) { + entered.put(packageName, null); + } + } + } + } } } @@ -137,11 +134,10 @@ public class PackageBrowseAdapter implements IStringButtonAdapter { public static List<IPackageFragment> searchAllPackages(IJavaProject project, String matcher) { try{ - IPackageFragmentRoot[] roots= project.getPackageFragmentRoots(); List<IPackageFragment> result= new ArrayList<>(); - for (int i= 0; i < roots.length; i++){ - if (canAddPackageRoot(roots[i])){ - getValidPackages(roots[i], result, null, matcher); + for (IPackageFragmentRoot root : project.getPackageFragmentRoots()) { + if (canAddPackageRoot(root)) { + getValidPackages(root, result, null, matcher); } } return result; diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchQuery.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchQuery.java index 0f5648127e..285b6c0152 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchQuery.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchQuery.java @@ -98,9 +98,7 @@ public class NLSSearchQuery implements ISearchQuery { CompilationUnitEntry groupElement= new CompilationUnitEntry(NLSSearchMessages.NLSSearchResultCollector_unusedKeys, compilationUnit); boolean hasUnusedPropertie= false; - IField[] fields= ((IType)wrapperClass).getFields(); - for (int j= 0; j < fields.length; j++) { - IField field= fields[j]; + for (IField field : ((IType)wrapperClass).getFields()) { if (isNLSField(field)) { ISourceRange sourceRange= field.getSourceRange(); if (sourceRange != null) { diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResult.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResult.java index 8db8793b84..70c8a33b3b 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResult.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResult.java @@ -17,7 +17,6 @@ package org.eclipse.jdt.internal.ui.refactoring.nls.search; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -96,8 +95,7 @@ public class NLSSearchResult extends AbstractTextSearchResult implements IEditor @Override public Match[] computeContainedMatches(AbstractTextSearchResult result, IFile file) { Set<Match> matches= new HashSet<>(); - for (Iterator<FileEntry> iter= fFileEntryGroups.iterator(); iter.hasNext();) { - FileEntry element= iter.next(); + for (FileEntry element : fFileEntryGroups) { if (element.getPropertiesFile().equals(file)) { matches.addAll(Arrays.asList(getMatches(element))); } @@ -106,8 +104,7 @@ public class NLSSearchResult extends AbstractTextSearchResult implements IEditor return matches.toArray(new Match[matches.size()]); try { - for (Iterator<CompilationUnitEntry> iter= fCompilationUnitGroups.iterator(); iter.hasNext();) { - CompilationUnitEntry element= iter.next(); + for (CompilationUnitEntry element : fCompilationUnitGroups) { ICompilationUnit cu= element.getCompilationUnit(); if (cu.exists() && file.equals(cu.getCorrespondingResource())) { matches.addAll(Arrays.asList(getMatches(element))); @@ -133,9 +130,8 @@ public class NLSSearchResult extends AbstractTextSearchResult implements IEditor if (element instanceof IParent) { IParent parent= (IParent) element; try { - IJavaElement[] children= parent.getChildren(); - for (int i= 0; i < children.length; i++) { - collectMatches(matches, children[i]); + for (IJavaElement child : parent.getChildren()) { + collectMatches(matches, child); } } catch (JavaModelException e) { // we will not be tracking these results diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultRequestor.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultRequestor.java index af1abc8ad5..7918e71cdd 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultRequestor.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultRequestor.java @@ -298,13 +298,13 @@ class NLSSearchResultRequestor extends SearchRequestor { keyPositionResult.setOffset(tokenStart); keyPositionResult.setLength(tokenEnd - tokenStart + 1); IType parentClass= (IType)enclosingElement.getAncestor(IJavaElement.TYPE); - IField[] fields= parentClass.getFields(); String identifier= source.substring(tokenStart, tokenEnd + 1); - for (int i= 0; i < fields.length; i++) { - if (fields[i].getElementName().equals(identifier)) { - if (!Signature.getSignatureSimpleName(fields[i].getTypeSignature()).equals("String")) //$NON-NLS-1$ + for (IField field : parentClass.getFields()) { + if (field.getElementName().equals(identifier)) { + if (!Signature.getSignatureSimpleName(field.getTypeSignature()).equals("String")) { //$NON-NLS-1$ return null; - Object obj= fields[i].getConstant(); + } + Object obj= field.getConstant(); return obj instanceof String ? ((String)obj).substring(1, ((String)obj).length() - 1) : NO_KEY; } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/CopyToClipboardAction.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/CopyToClipboardAction.java index fb46f6221c..3ed90280f6 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/CopyToClipboardAction.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/CopyToClipboardAction.java @@ -243,8 +243,8 @@ public class CopyToClipboardAction extends SelectionDispatchAction{ } private static void addFileNames(Set<String> fileName, IResource[] resources) { - for (int i= 0; i < resources.length; i++) { - addFileName(fileName, resources[i]); + for (IResource resource : resources) { + addFileName(fileName, resource); } } @@ -358,14 +358,20 @@ public class CopyToClipboardAction extends SelectionDispatchAction{ } private boolean canCopyAllToClipboard() { - for (int i= 0; i < fResources.length; i++) { - if (! canCopyToClipboard(fResources[i])) return false; + for (IResource resource : fResources) { + if (!canCopyToClipboard(resource)) { + return false; + } } - for (int i= 0; i < fJavaElements.length; i++) { - if (! canCopyToClipboard(fJavaElements[i])) return false; + for (IJavaElement javaElement : fJavaElements) { + if (!canCopyToClipboard(javaElement)) { + return false; + } } - for (int i= 0; i < fJarEntryResources.length; i++) { - if (fJarEntryResources[i] == null) return false; + for (IJarEntryResource jarEntryResource : fJarEntryResources) { + if (jarEntryResource == null) { + return false; + } } return true; } @@ -388,21 +394,29 @@ public class CopyToClipboardAction extends SelectionDispatchAction{ } private boolean hasProjects() { - for (int i= 0; i < fResources.length; i++) { - if (ReorgUtils.isProject(fResources[i])) return true; + for (IResource resource : fResources) { + if (ReorgUtils.isProject(resource)) { + return true; + } } - for (int i= 0; i < fJavaElements.length; i++) { - if (ReorgUtils.isProject(fJavaElements[i])) return true; + for (IJavaElement javaElement : fJavaElements) { + if (ReorgUtils.isProject(javaElement)) { + return true; + } } return false; } private boolean hasNonProjects() { - for (int i= 0; i < fResources.length; i++) { - if (! ReorgUtils.isProject(fResources[i])) return true; + for (IResource resource : fResources) { + if (!ReorgUtils.isProject(resource)) { + return true; + } } - for (int i= 0; i < fJavaElements.length; i++) { - if (! ReorgUtils.isProject(fJavaElements[i])) return true; + for (IJavaElement javaElement : fJavaElements) { + if (!ReorgUtils.isProject(javaElement)) { + return true; + } } return false; } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/DeleteWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/DeleteWizard.java index e2a15b8a98..017bd674bf 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/DeleteWizard.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/DeleteWizard.java @@ -233,8 +233,7 @@ public class DeleteWizard extends RefactoringWizard { } private static boolean containsLinkedPackagesOrPackageFragmentRoots(IJavaElement[] javaElements) { - for (int i= 0; i < javaElements.length; i++) { - IJavaElement element= javaElements[i]; + for (IJavaElement element : javaElements) { if (isLinkedPackageOrPackageFragmentRoot(element)) return true; } @@ -242,15 +241,13 @@ public class DeleteWizard extends RefactoringWizard { } private static boolean containsLinkedResources(IResource[] resources, IJavaElement[] javaElements) throws JavaModelException { - for (int i= 0; i < javaElements.length; i++) { - IJavaElement element= javaElements[i]; + for (IJavaElement element : javaElements) { if (isLinkedResource(element)) return true; if (isDefaultPackageWithLinkedFiles(element)) return true; } - for (int i= 0; i < resources.length; i++) { - IResource resource= resources[i]; + for (IResource resource : resources) { if (isLinked(resource)) return true; } @@ -261,10 +258,10 @@ public class DeleteWizard extends RefactoringWizard { if (!JavaElementUtil.isDefaultPackage(firstElement)) return false; IPackageFragment defaultPackage= (IPackageFragment)firstElement; - ICompilationUnit[] cus= defaultPackage.getCompilationUnits(); - for (int i= 0; i < cus.length; i++) { - if (isLinkedResource(cus[i])) + for (ICompilationUnit cu : defaultPackage.getCompilationUnits()) { + if (isLinkedResource(cu)) { return true; + } } return false; } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/DestinationContentProvider.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/DestinationContentProvider.java index bfb6416b88..5eeaee60e6 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/DestinationContentProvider.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/DestinationContentProvider.java @@ -73,10 +73,11 @@ public final class DestinationContentProvider extends StandardJavaElementContent } else { Object[] children= doGetChildren(element); ArrayList<Object> result= new ArrayList<>(children.length); - for (int i= 0; i < children.length; i++) { - IReorgDestination destination= ReorgDestinationFactory.createDestination(children[i]); - if (fValidator.canElementBeDestination(destination) || fValidator.canChildrenBeDestinations(destination)) - result.add(children[i]); + for (Object child : children) { + IReorgDestination destination= ReorgDestinationFactory.createDestination(child); + if (fValidator.canElementBeDestination(destination) || fValidator.canChildrenBeDestinations(destination)) { + result.add(child); + } } return result.toArray(); } @@ -104,8 +105,7 @@ public final class DestinationContentProvider extends StandardJavaElementContent boolean isFolderOnClasspath = javaProject.isOnClasspath(container); List<IResource> nonJavaResources= new ArrayList<>(); // Can be on classpath but as a member of non-java resource folder - for (int i= 0; i < members.length; i++) { - IResource member= members[i]; + for (IResource member : members) { // A resource can also be a java element // in the case of exclusion and inclusion filters. // We therefore exclude Java elements from the list @@ -127,8 +127,8 @@ public final class DestinationContentProvider extends StandardJavaElementContent private static Object[] getOpenNonJavaProjects(IJavaModel model) throws JavaModelException { Object[] nonJavaProjects= model.getNonJavaResources(); ArrayList<IProject> result= new ArrayList<>(nonJavaProjects.length); - for (int i= 0; i < nonJavaProjects.length; i++) { - IProject project = (IProject) nonJavaProjects[i]; + for (Object nonJavaProject : nonJavaProjects) { + IProject project = (IProject) nonJavaProject; if (project.isOpen()) result.add(project); } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java index 2ca73dca22..4d3114958f 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java @@ -248,8 +248,10 @@ public class PasteAction extends SelectionDispatchAction{ } private static boolean isAvailable(Transfer transfer, TransferData[] availableDataTypes) { - for (int i= 0; i < availableDataTypes.length; i++) { - if (transfer.isSupportedType(availableDataTypes[i])) return true; + for (TransferData availableDataType : availableDataTypes) { + if (transfer.isSupportedType(availableDataType)) { + return true; + } } return false; } @@ -267,11 +269,10 @@ public class PasteAction extends SelectionDispatchAction{ IResource[] resources= ReorgUtils.getResources(elements); IJavaElement[] javaElements= ReorgUtils.getJavaElements(elements); IWorkingSet[] workingSets= ReorgUtils.getWorkingSets(elements); - Paster[] pasters= createEnabledPasters(availableTypes, clipboard); - for (int i= 0; i < pasters.length; i++) { + for (Paster paster : createEnabledPasters(availableTypes, clipboard)) { try { - if (pasters[i].canPasteOn(javaElements, resources, workingSets, elements)) { - pasters[i].paste(javaElements, resources, workingSets, availableTypes); + if (paster.canPasteOn(javaElements, resources, workingSets, elements)) { + paster.paste(javaElements, resources, workingSets, availableTypes); return;// one is enough } } catch (JavaModelException e) { @@ -608,9 +609,8 @@ public class PasteAction extends SelectionDispatchAction{ IJavaElement cu; switch (destination.getElementType()) { case IJavaElement.JAVA_PROJECT : - IPackageFragmentRoot[] packageFragmentRoots= ((IJavaProject) destination).getPackageFragmentRoots(); - for (int i= 0; i < packageFragmentRoots.length; i++) { - packageFragmentRoot= packageFragmentRoots[i]; + for (IPackageFragmentRoot fragmentroot : ((IJavaProject) destination).getPackageFragmentRoots()) { + packageFragmentRoot= fragmentroot; if (isWritable(packageFragmentRoot)) { fDestination= packageFragmentRoot; return true; @@ -719,10 +719,10 @@ public class PasteAction extends SelectionDispatchAction{ pm.worked(1); } IConfirmQuery confirmQuery= new ReorgQueries(getShell()).createYesYesToAllNoNoToAllQuery(ReorgMessages.PasteAction_TextPaster_confirmOverwriting, true, IReorgQueries.CONFIRM_OVERWRITING); - for (int i= 0; i < fParsedCus.length; i++) { + for (ParsedCu parsedCu : fParsedCus) { if (pm.isCanceled()) break; - ICompilationUnit cu= pasteCU(fParsedCus[i], new SubProgressMonitor(pm, 1), confirmQuery); + ICompilationUnit cu= pasteCU(parsedCu, new SubProgressMonitor(pm, 1), confirmQuery); if (cu != null) cus.add(cu); } @@ -1100,9 +1100,7 @@ public class PasteAction extends SelectionDispatchAction{ IExecutionEnvironmentsManager eeManager= JavaRuntime.getExecutionEnvironmentsManager(); IExecutionEnvironment bestEE= null; - IExecutionEnvironment[] ees= eeManager.getExecutionEnvironments(); - outer: for (int j= 0; j < ees.length; j++) { - IExecutionEnvironment ee= ees[j]; + outer: for (IExecutionEnvironment ee : eeManager.getExecutionEnvironments()) { IVMInstall vm= ee.getDefaultVM(); String ver= getVMVersion(vm); if (ver != null) { @@ -1112,9 +1110,8 @@ public class PasteAction extends SelectionDispatchAction{ } } else { String eeVer= JavaModelUtil.getExecutionEnvironmentCompliance(ee); - IVMInstall[] compatibleVMs= ee.getCompatibleVMs(); - for (int i= 0; i < compatibleVMs.length; i++) { - vm= compatibleVMs[i]; + for (IVMInstall compatibleVM : ee.getCompatibleVMs()) { + vm= compatibleVM; ver= getVMVersion(vm); if (!eeVer.equals(ver)) continue; // don't want to set an EE where there's no strictly compatible VM @@ -1127,11 +1124,8 @@ public class PasteAction extends SelectionDispatchAction{ } } - IVMInstallType[] vmTypes= JavaRuntime.getVMInstallTypes(); - for (int i= 0; i < vmTypes.length; i++) { - IVMInstall[] vms= vmTypes[i].getVMInstalls(); - for (int j= 0; j < vms.length; j++) { - IVMInstall vm= vms[j]; + for (IVMInstallType vmType : JavaRuntime.getVMInstallTypes()) { + for (IVMInstall vm : vmType.getVMInstalls()) { String ver= getVMVersion(vm); if (ver != null && (bestVersion == null || JavaModelUtil.isVersionLessThan(bestVersion, ver))) { bestVersion= ver; @@ -1172,9 +1166,10 @@ public class PasteAction extends SelectionDispatchAction{ Set<IAdaptable> elements= new HashSet<>(Arrays.asList(workingSet.getElements())); IJavaElement[] javaElements= getClipboardJavaElements(availableTypes); if (javaElements != null) { - for (int i= 0; i < javaElements.length; i++) { - if (!ReorgUtils.containsElementOrParent(elements, javaElements[i])) - elements.add(javaElements[i]); + for (IJavaElement javaElement : javaElements) { + if (!ReorgUtils.containsElementOrParent(elements, javaElement)) { + elements.add(javaElement); + } } } IResource[] resources= getClipboardResources(availableTypes); @@ -1237,8 +1232,8 @@ public class PasteAction extends SelectionDispatchAction{ private void pasteProjects(IProject[] projects){ Shell shell= getShell(); - for (int i = 0; i < projects.length; i++) { - new CopyProjectOperation(shell).copyProject(projects[i]); + for (IProject project : projects) { + new CopyProjectOperation(shell).copyProject(project); } } private IProject[] getProjectsToPaste(TransferData[] availableTypes) { @@ -1268,9 +1263,10 @@ public class PasteAction extends SelectionDispatchAction{ private boolean canPasteSimpleProjects(TransferData[] availableDataTypes) { IResource[] resources= getClipboardResources(availableDataTypes); if (resources == null || resources.length == 0) return false; - for (int i= 0; i < resources.length; i++) { - if (resources[i].getType() != IResource.PROJECT || ! ((IProject)resources[i]).isOpen()) + for (IResource resource : resources) { + if (resource.getType() != IResource.PROJECT || !((IProject) resource).isOpen()) { return false; + } } return true; } @@ -1512,9 +1508,10 @@ public class PasteAction extends SelectionDispatchAction{ return new RefactoringStatus(); } private boolean canPasteAll(IJavaElement destination) { - for (int i= 0; i < fSources.length; i++) { - if (! canPaste(fSources[i].getType(), destination)) + for (TypedSource source : fSources) { + if (!canPaste(source.getType(), destination)) { return false; + } } return true; } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameInformationPopup.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameInformationPopup.java index f56e143181..3c25bae533 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameInformationPopup.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameInformationPopup.java @@ -879,9 +879,8 @@ public class RenameInformationPopup implements IWidgetTokenKeeper, IWidgetTokenK private static void recursiveSetBackgroundColor(Control control, Color color) { control.setBackground(color); if (control instanceof Composite) { - Control[] children= ((Composite) control).getChildren(); - for (int i= 0; i < children.length; i++) { - recursiveSetBackgroundColor(children[i], color); + for (Control child : ((Composite) control).getChildren()) { + recursiveSetBackgroundColor(child, color); } } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameLinkedMode.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameLinkedMode.java index cead0a0a42..d05e1c08fd 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameLinkedMode.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameLinkedMode.java @@ -401,9 +401,7 @@ public class RenameLinkedMode { private void restoreFullSelection() { if (fOriginalSelection.y != 0) { int originalOffset= fOriginalSelection.x; - LinkedPosition[] positions= fLinkedPositionGroup.getPositions(); - for (int i= 0; i < positions.length; i++) { - LinkedPosition position= positions[i]; + for (LinkedPosition position : fLinkedPositionGroup.getPositions()) { if (! position.isDeleted() && position.includes(originalOffset)) { fEditor.getViewer().setSelectedRange(position.offset, position.length); return; @@ -615,9 +613,7 @@ public class RenameLinkedMode { Point selection= fEditor.getViewer().getSelectedRange(); int start= selection.x; int end= start + selection.y; - LinkedPosition[] positions= fLinkedPositionGroup.getPositions(); - for (int i= 0; i < positions.length; i++) { - LinkedPosition position= positions[i]; + for (LinkedPosition position : fLinkedPositionGroup.getPositions()) { if (position.includes(start) && position.includes(end)) return position; } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameSelectionState.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameSelectionState.java index b9773b6a78..997c45bfea 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameSelectionState.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameSelectionState.java @@ -55,13 +55,11 @@ public class RenameSelectionState { IWorkbenchPage page = dw.getActivePage(); if (page == null) return; - IViewReference vrefs[]= page.getViewReferences(); - for(int i= 0; i < vrefs.length; i++) { - consider(vrefs[i].getPart(false)); + for (IViewReference vref : page.getViewReferences()) { + consider(vref.getPart(false)); } - IEditorReference refs[]= page.getEditorReferences(); - for(int i= 0; i < refs.length; i++) { - consider(refs[i].getPart(false)); + for (IEditorReference ref : page.getEditorReferences()) { + consider(ref.getPart(false)); } } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java index b2db988a8c..17c110493b 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java @@ -268,20 +268,19 @@ class RenameTypeWizardSimilarElementsPage extends UserInputWizardPage { return; @SuppressWarnings("unchecked") final Map<IJavaElement, String> similarElementsMap= (Map<IJavaElement, String>) newInput; - final IJavaElement[] similarElements= similarElementsMap.keySet().toArray(new IJavaElement[0]); fTreeElementMap= new HashMap<>(); fTopLevelElements= new HashSet<>(); - for (int i= 0; i < similarElements.length; i++) { - final IType declaring= (IType) similarElements[i].getAncestor(IJavaElement.TYPE); - if (similarElements[i] instanceof IMember) { + for (IJavaElement similarElement : similarElementsMap.keySet().toArray(new IJavaElement[0])) { + final IType declaring= (IType) similarElement.getAncestor(IJavaElement.TYPE); + if (similarElement instanceof IMember) { // methods, fields, initializers, inner types - addToMap(declaring, similarElements[i]); + addToMap(declaring, similarElement); } else { // local variables - final IJavaElement parent= similarElements[i].getParent(); + final IJavaElement parent= similarElement.getParent(); if (parent instanceof IMember) { // parent is a method or an initializer - addToMap(parent, similarElements[i]); + addToMap(parent, similarElement); addToMap(declaring, parent); } } @@ -602,9 +601,8 @@ class RenameTypeWizardSimilarElementsPage extends UserInputWizardPage { if (isSimilarElement(data)) { return data; } else { - TreeItem[] children= item.getItems(); - for (int i= 0; i < children.length; i++) { - Object childData= getFirstSimilarElement(children[i]); + for (TreeItem child : item.getItems()) { + Object childData= getFirstSimilarElement(child); if (childData != null) return childData; } @@ -638,8 +636,9 @@ class RenameTypeWizardSimilarElementsPage extends UserInputWizardPage { IJavaElement element= iter.next(); selection.put(element, Boolean.FALSE); } - for (int i= 0; i < selected.length; i++) - selection.put(selected[i], Boolean.TRUE); + for (IJavaElement s : selected) { + selection.put(s, Boolean.TRUE); + } } @@ -784,9 +783,10 @@ class RenameTypeWizardSimilarElementsPage extends UserInputWizardPage { private IJavaElement[] getCheckedSimilarElements() { Object[] checked= fTreeViewer.getCheckedElements(); List<IJavaElement> elements= new ArrayList<>(checked.length); - for (int i= 0; i < checked.length; i++) { - if (isSimilarElement(checked[i])) - elements.add((IJavaElement) checked[i]); + for (Object c : checked) { + if (isSimilarElement(c)) { + elements.add((IJavaElement) c); + } } return elements.toArray(new IJavaElement[elements.size()]); } diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/TypedSourceTransfer.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/TypedSourceTransfer.java index bbac9efeee..8cf2e415aa 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/TypedSourceTransfer.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/TypedSourceTransfer.java @@ -81,8 +81,8 @@ public class TypedSourceTransfer extends ByteArrayTransfer { dataOut.writeInt(sources.length); - for (int i = 0; i < sources.length; i++) { - writeJavaElement(dataOut, sources[i]); + for (TypedSource source : sources) { + writeJavaElement(dataOut, source); } dataOut.close(); diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java index 1780e51bbf..3df278a2aa 100644 --- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java +++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java @@ -394,8 +394,8 @@ public class SelfEncapsulateFieldInputPage extends UserInputWizardPage { combo.add(RefactoringMessages.SelfEncapsulateFieldInputPage_first_method); try { IMethod[] methods= field.getDeclaringType().getMethods(); - for (int i= 0; i < methods.length; i++) { - combo.add(JavaElementLabels.getElementLabel(methods[i], JavaElementLabels.M_PARAMETER_TYPES)); + for (IMethod method : methods) { + combo.add(JavaElementLabels.getElementLabel(method, JavaElementLabels.M_PARAMETER_TYPES)); } if (methods.length > 0) select= methods.length; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/AbstractJavaElementLabelDecorator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/AbstractJavaElementLabelDecorator.java index becdb09304..f73d50a98d 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/AbstractJavaElementLabelDecorator.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/AbstractJavaElementLabelDecorator.java @@ -109,9 +109,8 @@ public abstract class AbstractJavaElementLabelDecorator implements ILightweightL protected abstract void processDelta(IJavaElementDelta delta, List<IJavaElement> result); protected boolean processChildrenDelta(IJavaElementDelta delta, List<IJavaElement> result) { - IJavaElementDelta[] children= delta.getAffectedChildren(); - for (int i= 0; i < children.length; i++) { - processDelta(children[i], result); + for (IJavaElementDelta child : delta.getAffectedChildren()) { + processDelta(child, result); } return false; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JarEntryEditorInputFactory.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JarEntryEditorInputFactory.java index 6a121e4c46..41865e3794 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JarEntryEditorInputFactory.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JarEntryEditorInputFactory.java @@ -106,10 +106,9 @@ public class JarEntryEditorInputFactory implements IElementFactory { if (versionSepIndex > 0) { // try stripping plug-in version number String prefix= rootName.substring(0, versionSepIndex); - IPackageFragmentRoot[] roots= project.getPackageFragmentRoots(); - for (int i= 0; i < roots.length; i++) { - if (roots[i].getElementName().startsWith(prefix)) { - return roots[i]; + for (IPackageFragmentRoot root : project.getPackageFragmentRoots()) { + if (root.getElementName().startsWith(prefix)) { + return root; } } } @@ -120,8 +119,7 @@ public class JarEntryEditorInputFactory implements IElementFactory { int depth= pathSegments.length; segments: for (int i= 0; i < depth; i++) { String name= pathSegments[i]; - for (int j= 0; j < children.length; j++) { - Object child= children[j]; + for (Object child : children) { if (child instanceof IJarEntryResource) { IJarEntryResource jarEntryResource= (IJarEntryResource) child; if (name.equals(jarEntryResource.getName())) { |