diff options
Diffstat (limited to 'org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text')
15 files changed, 80 insertions, 92 deletions
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java index c107070083b..e3667a55c19 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AccessibilityPreferencePage.java @@ -224,8 +224,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork public int getIndex(EnumValue enumValue) { int i= 0; - for (Iterator<EnumValue> it= fItems.iterator(); it.hasNext();) { - EnumValue ev= it.next(); + for (EnumValue ev : fItems) { if (ev.equals(enumValue)) return i; i++; @@ -240,8 +239,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork } public EnumValue getValueByInteger(int intValue) { - for (Iterator<EnumValue> it= fItems.iterator(); it.hasNext();) { - EnumValue e= it.next(); + for (EnumValue e : fItems) { if (e.getIntValue() == intValue) return e; } @@ -443,8 +441,7 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork private void initializeFields() { - for (Iterator<Initializer> it= fInitializers.iterator(); it.hasNext();) { - Initializer initializer= it.next(); + for (Initializer initializer : fInitializers) { initializer.initialize(); } @@ -517,16 +514,16 @@ public class AccessibilityPreferencePage extends PreferencePage implements IWork indent(slaves[0]); boolean masterState= fOverlayStore.getBoolean(preference.getKey()); - for (int i= 0; i < slaves.length; i++) { - slaves[i].setEnabled(masterState); + for (Control slave : slaves) { + slave.setEnabled(masterState); } SelectionListener listener= new SelectionListener() { @Override public void widgetSelected(SelectionEvent e) { boolean state= master.getSelection(); - for (int i= 0; i < slaves.length; i++) { - slaves[i].setEnabled(state); + for (Control slave : slaves) { + slave.setEnabled(state); } } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java index 6c6a82665b9..a07d3991eb1 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/AnnotationsConfigurationBlock.java @@ -438,8 +438,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { if (!(data instanceof String)) return; - for (int i= 0; i < fListModel.length; i++) { - final ListItem element= fListModel[i]; + for (ListItem element : fListModel) { if (data.equals(element.label)) { final Control control= fAnnotationTypeViewer.getControl(); control.getDisplay().asyncExec(() -> { @@ -646,8 +645,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { public void dispose() { ImageRegistry registry= EditorsPlugin.getDefault().getImageRegistry(); - for (Iterator<String> it= fImageKeys.iterator(); it.hasNext();) { - String string= it.next(); + for (String string : fImageKeys) { registry.remove(string); } @@ -690,8 +688,7 @@ class AnnotationsConfigurationBlock implements IPreferenceConfigurationBlock { // set selection if (selection == null) { String val= item.textStyleKey == null ? SQUIGGLES[1] : fStore.getString(item.textStyleKey); - for (Iterator<String[]> iter= list.iterator(); iter.hasNext();) { - String[] elem= iter.next(); + for (String[] elem : list) { if (elem[1].equals(val)) { selection= elem; break; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java index 47d92444ce8..a0b6eea45d4 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java @@ -140,8 +140,7 @@ public class ConvertLineDelimitersAction extends FileBufferOperationAction { * @since 3.2 */ private boolean containsOnlyFiles(IResource[] resources) { - for (int i= 0; i < resources.length; i++) { - IResource resource= resources[i]; + for (IResource resource : resources) { if ((IResource.FILE & resource.getType()) == 0) return false; } @@ -158,8 +157,7 @@ public class ConvertLineDelimitersAction extends FileBufferOperationAction { private IFile[] filterUnacceptableFiles(IFile[] files) { boolean askForBinary= true; Set<IFile> filtered= new HashSet<>(); - for (int i= 0; i < files.length; i++) { - IFile file= files[i]; + for (IFile file : files) { if (isAcceptableLocation(file.getFullPath())) { filtered.add(file); } else if (askForBinary) { diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java index af3c1c9446b..770021d8ab5 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/HyperlinkDetectorsConfigurationBlock.java @@ -178,9 +178,9 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl private OverlayPreferenceStore.OverlayKey[] createOverlayStoreKeys() { ArrayList<OverlayKey> overlayKeys= new ArrayList<>(); - for (int i= 0; i < fHyperlinkDetectorDescriptors.length; i++) { - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, fHyperlinkDetectorDescriptors[i].getId())); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, fHyperlinkDetectorDescriptors[i].getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX)); + for (HyperlinkDetectorDescriptor fHyperlinkDetectorDescriptor : fHyperlinkDetectorDescriptors) { + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, fHyperlinkDetectorDescriptor.getId())); + overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, fHyperlinkDetectorDescriptor.getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX)); } overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINK_KEY_MODIFIER)); @@ -432,9 +432,11 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl private Object[] getCheckedItems() { List<ListItem> result= new ArrayList<>(); - for (int i= 0; i < fListModel.length; i++) - if (!fStore.getBoolean(fListModel[i].id)) - result.add(fListModel[i]); + for (ListItem i : fListModel) { + if (!fStore.getBoolean(i.id)) { + result.add(i); + } + } return result.toArray(); } @@ -498,8 +500,7 @@ class HyperlinkDetectorsConfigurationBlock implements IPreferenceConfigurationBl private ListItem[] createListModel() { ArrayList<ListItem> listModelItems= new ArrayList<>(); - for (int i= 0; i < fHyperlinkDetectorDescriptors.length; i++) { - HyperlinkDetectorDescriptor desc= fHyperlinkDetectorDescriptors[i]; + for (HyperlinkDetectorDescriptor desc : fHyperlinkDetectorDescriptors) { HyperlinkDetectorTargetDescriptor target= desc.getTarget(); int stateMask= fStore.getInt(desc.getId() + HyperlinkDetectorDescriptor.STATE_MASK_POSTFIX); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java index 05604cf898b..4b85bb89426 100755 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java @@ -466,8 +466,7 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { // set selection if (selection == null) { String val= getPreferenceStore().getString(item.textStyleKey); - for (Iterator<String[]> iter= list.iterator(); iter.hasNext();) { - String[] elem= iter.next(); + for (String[] elem : list) { if (elem[1].equals(val)) { selection= elem; break; @@ -527,8 +526,8 @@ class LinkedModeConfigurationBlock implements IPreferenceConfigurationBlock { @Override public void widgetSelected(SelectionEvent e) { boolean state= master.getSelection(); - for (int i= 0; i < slaves.length; i++) { - slaves[i].setEnabled(state); + for (Control slave : slaves) { + slave.setEnabled(state); } } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java index c28ed597431..18814d16806 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/NextPreviousPulldownActionDelegate.java @@ -144,8 +144,8 @@ public abstract class NextPreviousPulldownActionDelegate extends Action implemen private void fillMenu(Menu menu) { IAction[] actions= getActionsFromDescriptors(); - for (int i= 0; i < actions.length; i++) { - ActionContributionItem item= new ActionContributionItem(actions[i]); + for (IAction action : actions) { + ActionContributionItem item = new ActionContributionItem(action); item.fill(menu, -1); } } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java index 360927d4f4f..1c18a282318 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/OverlayPreferenceStore.java @@ -102,9 +102,10 @@ class OverlayPreferenceStore implements IPreferenceStore { * @return the overlay key or <code>null</code> if none can be found */ private OverlayKey findOverlayKey(String key) { - for (int i= 0; i < fOverlayKeys.length; i++) { - if (fOverlayKeys[i].fKey.equals(key)) - return fOverlayKeys[i]; + for (OverlayKey fOverlayKey : fOverlayKeys) { + if (fOverlayKey.fKey.equals(key)) { + return fOverlayKey; + } } return null; } @@ -185,8 +186,9 @@ class OverlayPreferenceStore implements IPreferenceStore { * Propagates all overlay keys from this store to the parent store. */ public void propagate() { - for (int i= 0; i < fOverlayKeys.length; i++) - propagateProperty(fStore, fOverlayKeys[i], fParent); + for (OverlayKey fOverlayKey : fOverlayKeys) { + propagateProperty(fStore, fOverlayKey, fParent); + } } /** @@ -248,8 +250,9 @@ class OverlayPreferenceStore implements IPreferenceStore { * Loads the values from the parent into this store. */ public void load() { - for (int i= 0; i < fOverlayKeys.length; i++) - loadProperty(fParent, fOverlayKeys[i], fStore, true); + for (OverlayKey fOverlayKey : fOverlayKeys) { + loadProperty(fParent, fOverlayKey, fStore, true); + } fLoaded= true; } @@ -258,8 +261,9 @@ class OverlayPreferenceStore implements IPreferenceStore { * Loads the default values. */ public void loadDefaults() { - for (int i= 0; i < fOverlayKeys.length; i++) - setToDefault(fOverlayKeys[i].fKey); + for (OverlayKey fOverlayKey : fOverlayKeys) { + setToDefault(fOverlayKey.fKey); + } } /** diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java index 0970136b8a3..c3f5fec0a20 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/QuickDiffConfigurationBlock.java @@ -259,8 +259,8 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { fQuickDiffOverviewRulerCheckBox.addSelectionListener(new SelectionListener() { @Override public void widgetSelected(SelectionEvent e) { - for (int i= 0; i < fQuickDiffModel.length; i++) { - fStore.setValue(fQuickDiffModel[i][1], fQuickDiffOverviewRulerCheckBox.getSelection()); + for (String[] fQuickDiff : fQuickDiffModel) { + fStore.setValue(fQuickDiff[1], fQuickDiffOverviewRulerCheckBox.getSelection()); } } @@ -378,12 +378,13 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { final boolean enabled= fEnablementCheckbox.getSelection(); fQuickDiffOverviewRulerCheckBox.setEnabled(enabled); fQuickDiffProviderCombo.setEnabled(enabled); - for (int i= 0; i < fQuickDiffColorEditors.length; i++) - fQuickDiffColorEditors[i].setEnabled(enabled); + for (ColorSelector fQuickDiffColorEditor : fQuickDiffColorEditors) { + fQuickDiffColorEditor.setEnabled(enabled); + } fQuickDiffProviderNote.setEnabled(enabled); Control[] quickDiffProviderNoteChildren= fQuickDiffProviderNote.getChildren(); - for (int i= 0; i < quickDiffProviderNoteChildren.length; i++) { - quickDiffProviderNoteChildren[i].setEnabled(enabled); + for (Control child : quickDiffProviderNoteChildren) { + child.setEnabled(enabled); } } @@ -400,8 +401,8 @@ class QuickDiffConfigurationBlock implements IPreferenceConfigurationBlock { @Override public void initialize() { - for (int i= 0; i < fQuickDiffProviderListModel.length; i++) { - String label= fQuickDiffProviderListModel[i][1]; + for (String[] fQuickDiffProvider : fQuickDiffProviderListModel) { + String label = fQuickDiffProvider[1]; fQuickDiffProviderCombo.add(label); } fQuickDiffProviderCombo.getDisplay().asyncExec(() -> updateProviderList()); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java index c25a0aa873b..1962c0cbd14 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java @@ -91,8 +91,7 @@ public class RemoveTrailingWhitespaceHandler extends FileBufferOperationHandler * @since 3.2 */ private boolean containsOnlyFiles(IResource[] resources) { - for (int i= 0; i < resources.length; i++) { - IResource resource= resources[i]; + for (IResource resource : resources) { if ((IResource.FILE & resource.getType()) == 0) return false; } @@ -108,8 +107,7 @@ public class RemoveTrailingWhitespaceHandler extends FileBufferOperationHandler */ private IFile[] filterUnacceptableFiles(IFile[] files) { Set<IFile> filtered= new HashSet<>(); - for (int i= 0; i < files.length; i++) { - IFile file= files[i]; + for (IFile file : files) { if (isAcceptableLocation(file.getFullPath())) filtered.add(file); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java index 9ff215c94f0..dc429846b1d 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesBlock.java @@ -345,8 +345,7 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList } Object[] treeChildren= treeContentProvider.getChildren(treeElement); - for (int i= 0; i < treeChildren.length; i++) { - Object child= treeChildren[i]; + for (Object child : treeChildren) { if (addAll) findAllSelectedListElements(child, fullLabel, true, filter); else { //Only continue for those with checked state @@ -417,8 +416,8 @@ class SelectResourcesBlock implements ICheckStateListener, ISelectionChangedList @Override public void filterElements(Object[] elements) throws InterruptedException { - for (int i= 0; i < elements.length; i++) { - returnValue.add(elements[i]); + for (Object element : elements) { + returnValue.add(element); } } }; diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java index 75ec3955a69..eece2dcc2ac 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SelectResourcesDialog.java @@ -136,8 +136,8 @@ class SelectResourcesDialog extends Dialog { public Object[] getChildren(Object o) { if (o instanceof IWorkspaceRoot) { HashSet<IResource> projects= new HashSet<>(); - for (int i= 0; i < fInput.length; i++) { - IResource project= fInput[i].getProject(); + for (IResource f : fInput) { + IResource project = f.getProject(); if ((project.getType() & resourceType) > 0) projects.add(project); } @@ -155,10 +155,10 @@ class SelectResourcesDialog extends Dialog { //filter out the desired resource types ArrayList<IResource> results = new ArrayList<>(); - for (int i = 0; i < members.length; i++) { + for (IResource member : members) { //And the test bits with the resource types to see if they are what we want - if ((members[i].getType() & resourceType) > 0 && (resourceType != IResource.FILE || fAcceptableLocationsFilter == null || fAcceptableLocationsFilter.accept(members[i]))) { - results.add(members[i]); + if ((member.getType() & resourceType) > 0 && (resourceType != IResource.FILE || fAcceptableLocationsFilter == null || fAcceptableLocationsFilter.accept(member))) { + results.add(member); } } return results.toArray(); @@ -278,8 +278,7 @@ class SelectResourcesDialog extends Dialog { protected void setSelection(IResource[] input, IFilter filter) { Map<IContainer, List<Object>> selectionMap= new Hashtable<>(); - for (int i= 0; i < input.length; i++) { - IResource resource= input[i]; + for (IResource resource : input) { if ((resource.getType() & IResource.FILE) > 0) { if (filter.accept(resource)) { List<Object> files= null; @@ -305,8 +304,7 @@ class SelectResourcesDialog extends Dialog { IResource[] resources= parent.members(); List<Object> selections= new ArrayList<>(); - for (int i= 0; i < resources.length; i++) { - IResource resource= resources[i]; + for (IResource resource : resources) { if ((resource.getType() & IResource.FILE) > 0) { if (filter.accept(resource)) selections.add(resource); diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java index 5788f49712e..7f886cc4742 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/SpellingConfigurationBlock.java @@ -202,8 +202,8 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { private Map<String, SpellingEngineDescriptor> createListModel() { SpellingEngineDescriptor[] descs= EditorsUI.getSpellingService().getSpellingEngineDescriptors(); Map<String, SpellingEngineDescriptor> map= new HashMap<>(); - for (int i= 0; i < descs.length; i++) { - map.put(descs[i].getId(), descs[i]); + for (SpellingEngineDescriptor desc : descs) { + map.put(desc.getId(), desc); } return map; } @@ -421,8 +421,9 @@ class SpellingConfigurationBlock implements IPreferenceConfigurationBlock { private void setEnabled(Control control, boolean enabled) { if (control instanceof Composite) { Control[] children= ((Composite) control).getChildren(); - for (int i= 0; i < children.length; i++) - setEnabled(children[i], enabled); + for (Control c : children) { + setEnabled(c, enabled); + } } control.setEnabled(enabled); } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusUtil.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusUtil.java index d52fcfd9931..c9cd6b850f7 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusUtil.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/StatusUtil.java @@ -51,8 +51,7 @@ public class StatusUtil { */ public static IStatus getMostSevere(IStatus[] status) { IStatus max= null; - for (int i= 0; i < status.length; i++) { - IStatus curr= status[i]; + for (IStatus curr : status) { if (curr.matches(IStatus.ERROR)) { return curr; } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java index 5f95b5c26b7..ba477d723a1 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TabFolderLayout.java @@ -64,8 +64,8 @@ class TabFolderLayout extends Layout { Rectangle rect= composite.getClientArea(); Control[] children = composite.getChildren(); - for (int i = 0; i < children.length; i++) { - children[i].setBounds(rect); + for (Control c : children) { + c.setBounds(rect); } } } diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java index 23e1615359b..43a5380a7bf 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorDefaultsPreferencePage.java @@ -270,8 +270,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements public int getIndex(EnumValue enumValue) { int i= 0; - for (Iterator<EnumValue> it= fItems.iterator(); it.hasNext();) { - EnumValue ev= it.next(); + for (EnumValue ev : fItems) { if (ev.equals(enumValue)) return i; i++; @@ -286,8 +285,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } public EnumValue getValueByInteger(int intValue) { - for (Iterator<EnumValue> it= fItems.iterator(); it.hasNext();) { - EnumValue e= it.next(); + for (EnumValue e : fItems) { if (e.getIntValue() == intValue) return e; } @@ -449,8 +447,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } private void initializeShowWhitespaceCharactersPreferences() { - for (Iterator<Initializer> it= fDialogInitializers.iterator(); it.hasNext();) { - Initializer initializer= it.next(); + for (Initializer initializer : fDialogInitializers) { initializer.initialize(); } } @@ -1039,8 +1036,9 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements initializeFields(); - for (int i= 0; i < fAppearanceColorListModel.length; i++) - fAppearanceColorList.add(fAppearanceColorListModel[i][0]); + for (String[] fAppearanceColor : fAppearanceColorListModel) { + fAppearanceColorList.add(fAppearanceColor[0]); + } fAppearanceColorList.getDisplay().asyncExec(() -> { if (fAppearanceColorList != null && !fAppearanceColorList.isDisposed()) { fAppearanceColorList.select(0); @@ -1050,8 +1048,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements } private void initializeFields() { - for (Iterator<Initializer> it= fInitializers.iterator(); it.hasNext();) { - Initializer initializer= it.next(); + for (Initializer initializer : fInitializers) { initializer.initialize(); } @@ -1212,8 +1209,7 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); combo.setLayoutData(gd); combo.setToolTipText(preference.getDescription()); - for (Iterator<EnumValue> it= domain.fItems.iterator(); it.hasNext();) { - EnumValue value= it.next(); + for (EnumValue value : domain.fItems) { combo.add(value.getLabel()); } @@ -1315,16 +1311,16 @@ public class TextEditorDefaultsPreferencePage extends PreferencePage implements indent(slaves[0]); boolean masterState= fOverlayStore.getBoolean(preference.getKey()); - for (int i= 0; i < slaves.length; i++) { - slaves[i].setEnabled(masterState); + for (Control slave : slaves) { + slave.setEnabled(masterState); } SelectionListener listener= new SelectionListener() { @Override public void widgetSelected(SelectionEvent e) { boolean state= master.getSelection(); - for (int i= 0; i < slaves.length; i++) { - slaves[i].setEnabled(state); + for (Control slave : slaves) { + slave.setEnabled(state); } } |