Use jdk 5 for-each loop
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: Ieca4e37237c93f0b5c1ab9841684408b4073bae7
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/internal/databinding/viewers/ViewerElementSet.java b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/internal/databinding/viewers/ViewerElementSet.java
index 78f3edb..330323c 100644
--- a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/internal/databinding/viewers/ViewerElementSet.java
+++ b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/internal/databinding/viewers/ViewerElementSet.java
@@ -157,8 +157,8 @@
outer: for (Iterator<?> iterator = iterator(); iterator.hasNext();) {
@SuppressWarnings("unchecked")
E element = (E) iterator.next();
- for (int i = 0; i < retainAll.length; i++) {
- if (comparer.equals(element, retainAll[i])) {
+ for (E retain : retainAll) {
+ if (comparer.equals(element, retain)) {
continue outer;
}
}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/CoolBarManager.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/CoolBarManager.java
index 2c2242c..6abdfe0 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/CoolBarManager.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/CoolBarManager.java
@@ -396,12 +396,11 @@
private int getNumRows(IContributionItem[] items) {
int numRows = 1;
boolean separatorFound = false;
- for (int i = 0; i < items.length; i++) {
- if (items[i].isSeparator()) {
+ for (IContributionItem item : items) {
+ if (item.isSeparator()) {
separatorFound = true;
}
- if ((separatorFound) && (isChildVisible(items[i])) && (!items[i].isGroupMarker())
- && (!items[i].isSeparator())) {
+ if ((separatorFound) && (isChildVisible(item)) && (!item.isGroupMarker()) && (!item.isSeparator())) {
numRows++;
separatorFound = false;
}
@@ -919,9 +918,9 @@
CoolItem[] items = coolBar.getItems();
if (items != null) {
ArrayList<Control> children = new ArrayList<>(items.length);
- for (int i = 0; i < items.length; i++) {
- if ((items[i].getControl() != null) && (!items[i].getControl().isDisposed())) {
- children.add(items[i].getControl());
+ for (CoolItem item : items) {
+ if ((item.getControl() != null) && (!item.getControl().isDisposed())) {
+ children.add(item.getControl());
}
}
// Convert array
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java
index 620415b..2257402 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/PathVariablesGroup.java
@@ -20,7 +20,6 @@
import java.net.URI;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedMap;
@@ -653,9 +652,7 @@
public boolean performOk() {
try {
// first process removed variables
- for (Iterator<String> removed = removedVariableNames.iterator(); removed
- .hasNext();) {
- String removedVariableName = removed.next();
+ for (String removedVariableName : removedVariableNames) {
// only removes variables that have not been added again
if (!tempPathVariables.containsKey(removedVariableName)) {
pathVariableManager.setURIValue(removedVariableName, null);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllSavedAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllSavedAction.java
index 46d4716..c867339 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllSavedAction.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CloseAllSavedAction.java
@@ -14,7 +14,6 @@
package org.eclipse.ui.internal;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorReference;
@@ -124,8 +123,7 @@
@Override
public void dispose() {
super.dispose();
- for (Iterator<IWorkbenchPart> it = partsWithListeners.iterator(); it.hasNext();) {
- IWorkbenchPart part = it.next();
+ for (IWorkbenchPart part : partsWithListeners) {
part.removePropertyListener(this);
}
partsWithListeners.clear();
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorHistory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorHistory.java
index 1acfb07..8c9187f 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorHistory.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorHistory.java
@@ -145,9 +145,7 @@
* @param memento the memento to save the mru history in
*/
public IStatus saveState(IMemento memento) {
- Iterator iterator = fifoList.iterator();
- while (iterator.hasNext()) {
- EditorHistoryItem item = (EditorHistoryItem) iterator.next();
+ for (EditorHistoryItem item : fifoList) {
if (item.canSave()) {
IMemento itemMemento = memento.createChild(IWorkbenchConstants.TAG_FILE);
item.saveState(itemMemento);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorMenuManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorMenuManager.java
index 0fb7826..01d9087 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorMenuManager.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorMenuManager.java
@@ -15,7 +15,6 @@
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IContributionItem;
@@ -204,8 +203,7 @@
if (wrappers == null) {
return;
}
- for (Iterator<EditorMenuManager> iter = wrappers.iterator(); iter.hasNext();) {
- EditorMenuManager element = iter.next();
+ for (EditorMenuManager element : wrappers) {
element.getAllContributedActions(set);
}
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java
index fbae87c..ab40169 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java
@@ -527,8 +527,7 @@
}
}
IMemento editorsMem = memento.createChild(IWorkbenchConstants.TAG_EDITORS);
- for (Iterator<NavigationHistoryEditorInfo> iter = editors.iterator(); iter.hasNext();) {
- NavigationHistoryEditorInfo info = iter.next();
+ for (NavigationHistoryEditorInfo info : editors) {
info.saveState(editorsMem.createChild(IWorkbenchConstants.TAG_EDITOR));
}
@@ -645,8 +644,7 @@
if (dup == null) {
return;
}
- for (Iterator<NavigationHistoryEntry> iter = history.iterator(); iter.hasNext();) {
- NavigationHistoryEntry entry = iter.next();
+ for (NavigationHistoryEntry entry : history) {
if (entry.editorInfo == dup) {
entry.editorInfo = info;
info.refCount++;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java
index 1f0a228..5119bf9 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSet.java
@@ -15,7 +15,6 @@
package org.eclipse.ui.internal;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Objects;
import java.util.Set;
import org.eclipse.core.runtime.Adapters;
@@ -198,9 +197,7 @@
memento.putString(IWorkbenchConstants.TAG_LABEL, getLabel());
memento.putString(IWorkbenchConstants.TAG_ID, getUniqueId());
memento.putString(IWorkbenchConstants.TAG_EDIT_PAGE_ID, editPageId);
- Iterator iterator = elements.iterator();
- while (iterator.hasNext()) {
- IAdaptable adaptable = (IAdaptable) iterator.next();
+ for (IAdaptable adaptable : elements) {
final IPersistableElement persistable = Adapters.adapt(adaptable, IPersistableElement.class);
if (persistable != null) {
final IMemento itemMemento = memento.createChild(IWorkbenchConstants.TAG_ITEM);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java
index c3c4c52..ee960f7 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java
@@ -21,7 +21,6 @@
import java.nio.charset.IllegalCharsetNameException;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -508,8 +507,7 @@
}
boolean enabled = true;
List<Spec> elements = selection.toList();
- for (Iterator<Spec> i = elements.iterator(); i.hasNext();) {
- Spec spec = i.next();
+ for (Spec spec : elements) {
if (spec.isPredefined) {
enabled = false;
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java
index 5f0fee7..4299e6f 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/KeysPreferencePage.java
@@ -1556,8 +1556,7 @@
contextIdsByUniqueName = new HashMap<>();
contextUniqueNamesById = new HashMap<>();
- for (Iterator<Map.Entry<String, Set<Context>>> iterator = contextsByName.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry<String, Set<Context>> entry = iterator.next();
+ for (Map.Entry<String, Set<Context>> entry : contextsByName.entrySet()) {
String name = entry.getKey();
Set<Context> contexts = entry.getValue();
Iterator<Context> iterator2 = contexts.iterator();
@@ -1570,7 +1569,7 @@
while (iterator2.hasNext()) {
Context context = iterator2.next();
String uniqueName = MessageFormat.format(Util.translateString(RESOURCE_BUNDLE, "uniqueName"), //$NON-NLS-1$
- name, context.getId());
+ name, context.getId());
contextIdsByUniqueName.put(uniqueName, context.getId());
contextUniqueNamesById.put(context.getId(), uniqueName);
}
@@ -1580,9 +1579,7 @@
categoryIdsByUniqueName = new HashMap<>();
categoryUniqueNamesById = new HashMap<>();
- for (Iterator<Map.Entry<String, Set<Category>>> iterator = categoriesByName.entrySet().iterator(); iterator
- .hasNext();) {
- Map.Entry<String, Set<Category>> entry = iterator.next();
+ for (Map.Entry<String, Set<Category>> entry : categoriesByName.entrySet()) {
String name = entry.getKey();
Set<Category> categories = entry.getValue();
Iterator<Category> iterator2 = categories.iterator();
@@ -1595,7 +1592,7 @@
while (iterator2.hasNext()) {
Category category = iterator2.next();
String uniqueName = MessageFormat.format(Util.translateString(RESOURCE_BUNDLE, "uniqueName"), //$NON-NLS-1$
- new Object[] { name, category.getId() });
+ new Object[] { name, category.getId() });
categoryIdsByUniqueName.put(uniqueName, category.getId());
categoryUniqueNamesById.put(category.getId(), uniqueName);
}
@@ -1605,8 +1602,7 @@
schemeIdsByUniqueName = new HashMap<>();
schemeUniqueNamesById = new HashMap<>();
- for (Iterator<Map.Entry<String, Set<Scheme>>> iterator = schemesByName.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry<String, Set<Scheme>> entry = iterator.next();
+ for (Map.Entry<String, Set<Scheme>> entry : schemesByName.entrySet()) {
String name = entry.getKey();
Set<Scheme> keyConfigurations = entry.getValue();
Iterator<Scheme> iterator2 = keyConfigurations.iterator();
@@ -1619,7 +1615,7 @@
while (iterator2.hasNext()) {
Scheme scheme = iterator2.next();
String uniqueName = MessageFormat.format(Util.translateString(RESOURCE_BUNDLE, "uniqueName"), //$NON-NLS-1$
- new Object[] { name, scheme.getId() });
+ new Object[] { name, scheme.getId() });
schemeIdsByUniqueName.put(uniqueName, scheme.getId());
schemeUniqueNamesById.put(scheme.getId(), uniqueName);
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/CommandProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/CommandProvider.java
index 2c1269c..e9023e2 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/CommandProvider.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/CommandProvider.java
@@ -19,7 +19,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ParameterizedCommand;
@@ -100,9 +99,8 @@
ParameterizedCommand pcmd = new ParameterizedCommand(command, null);
if (command != null && ehandlerService.canExecute(pcmd)) {
try {
- Collection<?> combinations = ParameterizedCommand.generateCombinations(command);
- for (Iterator<?> it = combinations.iterator(); it.hasNext();) {
- ParameterizedCommand pc = (ParameterizedCommand) it.next();
+ Collection<ParameterizedCommand> combinations = ParameterizedCommand.generateCombinations(command);
+ for (ParameterizedCommand pc : combinations) {
String id = pc.serialize();
synchronized (idToCommand) {
idToCommand.put(id, new CommandElement(pc, id, this));
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/PerspectiveProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/PerspectiveProvider.java
index e3c7f07..52ea4bf 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/PerspectiveProvider.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/PerspectiveProvider.java
@@ -53,9 +53,9 @@
IPerspectiveDescriptor[] perspectives = PlatformUI.getWorkbench().getPerspectiveRegistry()
.getPerspectives();
cachedElements = new QuickAccessElement[perspectives.length];
- for (int i = 0; i < perspectives.length; i++) {
- if (!WorkbenchActivityHelper.filterItem(perspectives[i])) {
- PerspectiveElement perspectiveElement = new PerspectiveElement(perspectives[i]);
+ for (IPerspectiveDescriptor perspective : perspectives) {
+ if (!WorkbenchActivityHelper.filterItem(perspective)) {
+ PerspectiveElement perspectiveElement = new PerspectiveElement(perspective);
idToElement.put(perspectiveElement.getId(), perspectiveElement);
}
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/PreferenceProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/PreferenceProvider.java
index 87a7120..ea8fecb 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/PreferenceProvider.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/PreferenceProvider.java
@@ -65,13 +65,12 @@
}
private void collectElements(String prefix, IPreferenceNode[] subNodes, List<PreferenceElement> result) {
- for (int i = 0; i < subNodes.length; i++) {
- if (!WorkbenchActivityHelper.filterItem(subNodes[i])) {
- PreferenceElement preferenceElement = new PreferenceElement(subNodes[i], prefix);
+ for (IPreferenceNode subNode : subNodes) {
+ if (!WorkbenchActivityHelper.filterItem(subNode)) {
+ PreferenceElement preferenceElement = new PreferenceElement(subNode, prefix);
result.add(preferenceElement);
- String nestedPrefix = prefix.length() == 0 ? subNodes[i].getLabelText()
- : (prefix + "/" + subNodes[i].getLabelText()); //$NON-NLS-1$
- collectElements(nestedPrefix, subNodes[i].getSubNodes(), result);
+ String nestedPrefix = prefix.length() == 0 ? subNode.getLabelText() : (prefix + "/" + subNode.getLabelText()); //$NON-NLS-1$
+ collectElements(nestedPrefix, subNode.getSubNodes(), result);
}
}
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/WizardProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/WizardProvider.java
index 44a4693..c43e151 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/WizardProvider.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/providers/WizardProvider.java
@@ -53,9 +53,9 @@
List<IWizardDescriptor> result = new ArrayList<>();
collectWizards(rootCategory, result);
IWizardDescriptor[] wizards = result.toArray(new IWizardDescriptor[result.size()]);
- for (int i = 0; i < wizards.length; i++) {
- if (!WorkbenchActivityHelper.filterItem(wizards[i])) {
- WizardElement wizardElement = new WizardElement(wizards[i]);
+ for (IWizardDescriptor wizard : wizards) {
+ if (!WorkbenchActivityHelper.filterItem(wizard)) {
+ WizardElement wizardElement = new WizardElement(wizard);
idToElement.put(wizardElement.getId(), wizardElement);
}
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java
index 85eabda..54a68fd 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java
@@ -1031,13 +1031,12 @@
if (cascadingTheme != null)
cascadingTheme.dispose();
- for (Iterator<IThemePreview> i = previewSet.iterator(); i.hasNext();) {
- IThemePreview preview = i.next();
+ for (IThemePreview preview : previewSet) {
try {
preview.dispose();
} catch (RuntimeException e) {
WorkbenchPlugin.log(RESOURCE_BUNDLE.getString("errorDisposePreviewLog"), //$NON-NLS-1$
- StatusUtil.newStatus(IStatus.ERROR, e.getMessage(), e));
+ StatusUtil.newStatus(IStatus.ERROR, e.getMessage(), e));
}
}
previewSet.clear();
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java
index 3b2b59e..522696d 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/MultiPageEditorPart.java
@@ -18,7 +18,6 @@
import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
@@ -770,8 +769,7 @@
@Override
public boolean isDirty() {
// use nestedEditors to avoid SWT requests; see bug 12996
- for (Iterator<IEditorPart> i = nestedEditors.iterator(); i.hasNext();) {
- IEditorPart editor = i.next();
+ for (IEditorPart editor : nestedEditors) {
if (editor.isDirty()) {
return true;
}
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/mask/internal/EditMaskParser.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/mask/internal/EditMaskParser.java
index fc3c0a6..2a1e9f4 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/mask/internal/EditMaskParser.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/mask/internal/EditMaskParser.java
@@ -45,8 +45,8 @@
* @param input the user input which may or may not be in valid format
*/
public void setInput(String input) {
- for (int i = 0; i < expectedTokens.length; i++) {
- expectedTokens[i].clear();
+ for (EditMaskLexerAndToken expectedToken : expectedTokens) {
+ expectedToken.clear();
}
int tokenPosition = 0;
int inputPosition = 0;
@@ -72,8 +72,8 @@
*/
public String getFormattedResult() {
StringBuilder result = new StringBuilder();
- for (int i = 0; i < expectedTokens.length; i++) {
- String outputChar = expectedTokens[i].getInput();
+ for (EditMaskLexerAndToken expectedToken : expectedTokens) {
+ String outputChar = expectedToken.getInput();
if (outputChar == null) {
outputChar = "" + placeholder;
}
@@ -87,11 +87,11 @@
*/
public String getRawResult() {
StringBuilder result = new StringBuilder();
- for (int i = 0; i < expectedTokens.length; i++) {
- if (expectedTokens[i].isReadOnly()) {
+ for (EditMaskLexerAndToken expectedToken : expectedTokens) {
+ if (expectedToken.isReadOnly()) {
continue;
}
- String outputChar = expectedTokens[i].getInput();
+ String outputChar = expectedToken.getInput();
if (outputChar == null) {
outputChar = "";
}
@@ -104,8 +104,8 @@
* @return true if the current input is a valid input
*/
public boolean isComplete() {
- for (int i = 0; i < expectedTokens.length; i++) {
- if (!expectedTokens[i].isComplete()) {
+ for (EditMaskLexerAndToken expectedToken : expectedTokens) {
+ if (!expectedToken.isComplete()) {
return false;
}
}
diff --git a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeModelFactory.java b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeModelFactory.java
index 0a00307..a73a612 100644
--- a/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeModelFactory.java
+++ b/examples/org.eclipse.ui.examples.readmetool/Eclipse UI Examples Readme Tool/org/eclipse/ui/examples/readmetool/ReadmeModelFactory.java
@@ -147,12 +147,12 @@
if (i == extensions.length - 1) {
IConfigurationElement[] configElements = currentExtension
.getConfigurationElements();
- for (int j = 0; j < configElements.length; j++) {
+ for (IConfigurationElement configElement : configElements) {
IConfigurationElement config = configElements[i];
if (config.getName()
- .equals(IReadmeConstants.TAG_PARSER)) {
+ .equals(IReadmeConstants.TAG_PARSER)) {
// process the first 'parser' element and stop
- processParserElement(config);
+ processParserElement(config);
break;
}
}
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/UITestCase.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/UITestCase.java
index a518658..9c985e2 100644
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/UITestCase.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/UITestCase.java
@@ -174,8 +174,9 @@
if (status.isMultiStatus()) {
IStatus[] children = status.getChildren();
- for (int i = 0; i < children.length; i++)
- write(children[i], indent + 1);
+ for (IStatus child : children) {
+ write(child, indent + 1);
+ }
}
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSetup.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSetup.java
index 2c29e07..3921f15 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSetup.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSetup.java
@@ -78,8 +78,7 @@
* TODO: remove when https://bugs.eclipse.org/bugs/show_bug.cgi?id=71362 is fixed
*/
StackTraceElement[] elements= new Throwable().getStackTrace();
- for (int i= 0; i < elements.length; i++) {
- StackTraceElement element= elements[i];
+ for (StackTraceElement element : elements) {
if (element.getClassName().equals("org.eclipse.test.EclipseTestRunner")) {
PlatformUI.getWorkbench().close();
break;
