Bug - doogfooding enhanced for loop
Change-Id: I97cd131706c11235cee2bed15f7fe70a3fab688b
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenterCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenterCore.java
index c642712..bdd5fd3 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenterCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenterCore.java
@@ -67,9 +67,9 @@
try {
Position[] positions= event.getDocument().getPositions(fCategory);
- for (int i= 0; i != positions.length; i++) {
+ for (Position position2 : positions) {
- HighlightedPositionCore position= (HighlightedPositionCore) positions[i];
+ HighlightedPositionCore position= (HighlightedPositionCore) position2;
// Also update deleted positions because they get deleted by the background thread and removed/invalidated only in the UI runnable
// if (position.isDeleted())
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddUnimplementedConstructorsOperation.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddUnimplementedConstructorsOperation.java
index 2132263..54705d5 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddUnimplementedConstructorsOperation.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddUnimplementedConstructorsOperation.java
@@ -304,8 +304,8 @@
private ASTNode getNodeToInsertBefore(ListRewrite rewriter) {
if (fInsertPos != -1) {
List<?> members= rewriter.getOriginalList();
- for (int i= 0; i < members.size(); i++) {
- ASTNode curr= (ASTNode) members.get(i);
+ for (Object member : members) {
+ ASTNode curr= (ASTNode) member;
if (curr.getStartPosition() >= fInsertPos) {
return curr;
}
diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java
index 5da9e10..9e6f31b 100644
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java
+++ b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java
@@ -400,8 +400,8 @@
}
if (fDebugMode) {
System.out.println("Packages:"); //$NON-NLS-1$
- for (int i= 0; i < fPackageNames.length; i++) {
- System.out.println(" "+fPackageNames[i]); //$NON-NLS-1$
+ for (String fPackageName : fPackageNames) {
+ System.out.println(" "+fPackageName); //$NON-NLS-1$
}
}
}
@@ -421,8 +421,8 @@
}
if (fDebugMode) {
System.out.println("Tests:"); //$NON-NLS-1$
- for (int i= 0; i < fTestClassNames.length; i++) {
- System.out.println(" "+fTestClassNames[i]); //$NON-NLS-1$
+ for (String fTestClassName : fTestClassNames) {
+ System.out.println(" "+fTestClassName); //$NON-NLS-1$
}
}
}
@@ -442,8 +442,8 @@
}
if (fDebugMode) {
System.out.println("Failures:"); //$NON-NLS-1$
- for (int i= 0; i < fFailureNames.length; i++) {
- System.out.println(" "+fFailureNames[i]); //$NON-NLS-1$
+ for (String fFailureName : fFailureNames) {
+ System.out.println(" "+fFailureName); //$NON-NLS-1$
}
}
}
@@ -498,8 +498,7 @@
protected Class<?>[] loadClasses(String[] testClassNames) {
Vector<Class<?>> classes= new Vector<Class<?>>();
- for (int i = 0; i < testClassNames.length; i++) {
- String name = testClassNames[i];
+ for (String name : testClassNames) {
Class<?> clazz = loadClass(name, this);
if (clazz != null) {
classes.add(clazz);
@@ -547,8 +546,8 @@
long startTime = System.currentTimeMillis();
if (fDebugMode)
System.out.print("start send tree..."); //$NON-NLS-1$
- for (int i = 0; i < suites.length; i++) {
- suites[i].sendTree(this);
+ for (ITestReference suite : suites) {
+ suite.sendTree(this);
}
if (fDebugMode)
System.out.println("done send tree - time(ms): " + (System.currentTimeMillis() - startTime)); //$NON-NLS-1$
@@ -556,8 +555,7 @@
private int countTests(ITestReference[] tests) {
int count= 0;
- for (int i= 0; i < tests.length; i++) {
- ITestReference test= tests[i];
+ for (ITestReference test : tests) {
if (test != null)
count= count + test.countTestCases();
}
diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/TestExecution.java b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/TestExecution.java
index 417837c..ddcfe7f 100644
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/TestExecution.java
+++ b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/TestExecution.java
@@ -17,7 +17,6 @@
package org.eclipse.jdt.internal.junit.runner;
import java.util.ArrayList;
-import java.util.Iterator;
public class TestExecution {
private boolean fShouldStop = false;
@@ -35,10 +34,10 @@
}
public void run(ITestReference[] suites) {
- for (int i = 0; i < suites.length; i++) {
+ for (ITestReference suite : suites) {
if (fShouldStop)
return;
- suites[i].run(this);
+ suite.run(this);
}
}
@@ -48,8 +47,7 @@
public void stop() {
fShouldStop = true;
- for (Iterator<IStopListener> iter = fStopListeners.iterator(); iter.hasNext();) {
- IStopListener listener = iter.next();
+ for (IStopListener listener : fStopListeners) {
listener.stop();
}
}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
index fe609a1..e5f06bd 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
@@ -1318,8 +1318,8 @@
sortingCriterion= SortingCriterion.values() [tagSortingCriterion];
}
setSortingCriterion(sortingCriterion);
- for (int i= 0; i < fToggleSortingActions.length; i++) {
- fToggleSortingActions[i].setChecked(sortingCriterion == fToggleSortingActions[i].getActionSortingCriterion());
+ for (ToggleSortingAction fToggleSortingAction : fToggleSortingActions) {
+ fToggleSortingAction.setChecked(sortingCriterion == fToggleSortingAction.getActionSortingCriterion());
}
setFilterAndLayout(showFailuresOnly, showIgnoredOnly, layoutValue);
@@ -2104,8 +2104,8 @@
new ToggleSortingAction(SortingCriterion.SORT_BY_EXECUTION_TIME),
new ToggleSortingAction(SortingCriterion.SORT_BY_NAME)};
fSortByMenu= new MenuManager(JUnitMessages.TestRunnerViewPart_sort_by_menu);
- for (int i= 0; i < fToggleSortingActions.length; ++i) {
- fSortByMenu.add(fToggleSortingActions[i]);
+ for (ToggleSortingAction fToggleSortingAction : fToggleSortingActions) {
+ fSortByMenu.add(fToggleSortingAction);
}
viewMenu.add(fSortByMenu);
viewMenu.add(new Separator());
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java
index 4bfe4fa..f328221 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java
@@ -142,9 +142,9 @@
buffer.append(fDeclarations.toString() + "\n"); //$NON-NLS-1$
System.out.println(fDeclarations.toString());
- for (int i= 0; i < fDeclarationLines.size(); i++) {
- fSmap[line++]= ((Integer)fDeclarationLines.get(i)).intValue();
- System.out.println("" + ((Integer)fDeclarationLines.get(i)).intValue()); //$NON-NLS-1$
+ for (Object fDeclarationLine : fDeclarationLines) {
+ fSmap[line++]= ((Integer)fDeclarationLine).intValue();
+ System.out.println("" + ((Integer)fDeclarationLine).intValue()); //$NON-NLS-1$
}
fSmap[line]= fSmap[line - 1] + 1;
line++;
@@ -156,17 +156,17 @@
if (fLocalDeclarations.length() > 0) {
buffer.append(fLocalDeclarations.toString());
System.out.println(fLocalDeclarations);
- for (int i= 0; i < fLocalDeclarationLines.size(); i++) {
- System.out.println("" + ((Integer)fLocalDeclarationLines.get(i)).intValue()); //$NON-NLS-1$
- fSmap[line++]= ((Integer)fLocalDeclarationLines.get(i)).intValue();
+ for (Object fLocalDeclarationLine : fLocalDeclarationLines) {
+ System.out.println("" + ((Integer)fLocalDeclarationLine).intValue()); //$NON-NLS-1$
+ fSmap[line++]= ((Integer)fLocalDeclarationLine).intValue();
}
}
buffer.append(fContent.toString());
System.out.println(fContent);
- for (int i= 0; i < fContentLines.size(); i++) {
- fSmap[line++]= ((Integer)fContentLines.get(i)).intValue();
- System.out.println("" + ((Integer)fContentLines.get(i)).intValue()); //$NON-NLS-1$
+ for (Object fContentLine : fContentLines) {
+ fSmap[line++]= ((Integer)fContentLine).intValue();
+ System.out.println("" + ((Integer)fContentLine).intValue()); //$NON-NLS-1$
}
buffer.append(" }\n"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
index c6222c7..240ad98 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
@@ -89,8 +89,7 @@
*/
public class QuickFixTest {
public static void assertCorrectLabels(List<? extends ICompletionProposal> proposals) {
- for (int i= 0; i < proposals.size(); i++) {
- ICompletionProposal proposal= proposals.get(i);
+ for (ICompletionProposal proposal : proposals) {
String name= proposal.getDisplayString();
if (name == null || name.length() == 0 || name.charAt(0) == '!' || name.contains("{0}") || name.contains("{1}")) {
fail("wrong proposal label: " + name);
@@ -462,8 +461,7 @@
if (proposals.size() != expectedProposals) {
StringBuffer buf= new StringBuffer();
buf.append("Wrong number of proposals, is: ").append(proposals.size()). append(", expected: ").append(expectedProposals).append('\n');
- for (int i= 0; i < proposals.size(); i++) {
- ICompletionProposal curr= proposals.get(i);
+ for (ICompletionProposal curr : proposals) {
buf.append(" - ").append(curr.getDisplayString()).append('\n');
if (curr instanceof CUCorrectionProposal) {
appendSource(((CUCorrectionProposal) curr), buf);
@@ -474,8 +472,7 @@
}
protected static ICommandAccess findProposalByCommandId(String commandId, List<? extends ICompletionProposal> proposals) {
- for (int i= 0; i < proposals.size(); i++) {
- Object curr= proposals.get(i);
+ for (ICompletionProposal curr : proposals) {
if (curr instanceof ICommandAccess) {
if (commandId.equals(((ICommandAccess) curr).getCommandId())) {
return (ICommandAccess) curr;
@@ -486,10 +483,9 @@
}
protected static ICompletionProposal findProposalByName(String name, List<? extends ICompletionProposal> proposals) {
- for (int i= 0; i < proposals.size(); i++) {
- Object curr= proposals.get(i);
- if (curr instanceof ICompletionProposal && name.equals(((ICompletionProposal)curr).getDisplayString()))
- return (ICompletionProposal)curr;
+ for (ICompletionProposal curr : proposals) {
+ if (name.equals(curr.getDisplayString()))
+ return curr;
}
return null;
}
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/buildpath/ClasspathModifier.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/buildpath/ClasspathModifier.java
index f6aa50d..f85fd0b 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/buildpath/ClasspathModifier.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/buildpath/ClasspathModifier.java
@@ -1421,8 +1421,8 @@
@Override
public boolean validate(IPath outputLocation) {
- for (int i= 0; i < newElements.size(); i++) {
- if (isInvalid(newElements.get(i), outputLocation))
+ for (Object newElement : newElements) {
+ if (isInvalid(newElement, outputLocation))
return false;
}
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddUnimplementedMethodsOperation.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddUnimplementedMethodsOperation.java
index 2ac66dd..dae1a81 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddUnimplementedMethodsOperation.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/codemanipulation/AddUnimplementedMethodsOperation.java
@@ -245,8 +245,8 @@
private ASTNode getNodeToInsertBefore(ListRewrite rewriter) {
if (fInsertPos != -1) {
List<?> members= rewriter.getOriginalList();
- for (int i= 0; i < members.size(); i++) {
- ASTNode curr= (ASTNode) members.get(i);
+ for (Object member : members) {
+ ASTNode curr= (ASTNode) member;
if (curr.getStartPosition() >= fInsertPos) {
return curr;
}
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/ExclusivePositionUpdater.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/ExclusivePositionUpdater.java
index 8edcc3a..876738e 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/ExclusivePositionUpdater.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/ExclusivePositionUpdater.java
@@ -51,9 +51,7 @@
try {
Position[] positions= event.getDocument().getPositions(fCategory);
- for (int i= 0; i != positions.length; i++) {
-
- Position position= positions[i];
+ for (Position position : positions) {
if (position.isDeleted())
continue;
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/JavaFormatter.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/JavaFormatter.java
index ee406ed..63fcce0 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/JavaFormatter.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/JavaFormatter.java
@@ -161,24 +161,23 @@
MultiTextEdit root= new MultiTextEdit(0, document.getLength());
List<TextEdit> edits= new ArrayList<>();
boolean hasModifications= false;
- for (int i= 0; i != variables.length; i++) {
- final TemplateVariable variable= variables[i];
+ for (final TemplateVariable variable : variables) {
int[] offsets= variable.getOffsets();
String value= variable.getDefaultValue();
if (isWhitespaceVariable(value)) {
// replace whitespace positions with unformattable comments
String placeholder= COMMENT_START + value + COMMENT_END;
- for (int j= 0; j != offsets.length; j++) {
- ReplaceEdit replace= new ReplaceEdit(offsets[j], value.length(), placeholder);
+ for (int offset : offsets) {
+ ReplaceEdit replace= new ReplaceEdit(offset, value.length(), placeholder);
root.addChild(replace);
hasModifications= true;
markerToOriginal.put(replace, value);
edits.add(replace);
}
} else {
- for (int j= 0; j != offsets.length; j++) {
- RangeMarker marker= new RangeMarker(offsets[j], value.length());
+ for (int offset : offsets) {
+ RangeMarker marker= new RangeMarker(offset, value.length());
root.addChild(marker);
edits.add(marker);
}
@@ -225,9 +224,7 @@
}
Iterator<TypedPosition> it= positions.iterator();
- for (int i= 0; i != variables.length; i++) {
- TemplateVariable variable= variables[i];
-
+ for (TemplateVariable variable : variables) {
int[] offsets= new int[variable.getOffsets().length];
for (int j= 0; j != offsets.length; j++)
offsets[j]= it.next().getOffset();
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/TemplateSet.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/TemplateSet.java
index 72e3d77..8d9e091 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/TemplateSet.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/template/java/TemplateSet.java
@@ -236,9 +236,7 @@
Node root= document.createElement("templates"); //$NON-NLS-1$
document.appendChild(root);
- for (int i= 0; i != fTemplates.size(); i++) {
- Template template= fTemplates.get(i);
-
+ for (Template template : fTemplates) {
Node node= document.createElement(getTemplateTag());
root.appendChild(node);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/CompilationUnitEditor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/CompilationUnitEditor.java
index 1d25f53..fd5a3c9 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/CompilationUnitEditor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/CompilationUnitEditor.java
@@ -356,9 +356,7 @@
try {
Position[] positions= event.getDocument().getPositions(fCategory);
- for (int i= 0; i != positions.length; i++) {
-
- Position position= positions[i];
+ for (Position position : positions) {
if (position.isDeleted())
continue;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java
index df3fd64..58cca7f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java
@@ -811,8 +811,7 @@
List<?> list= fProvider.getChildren(elem);
String name= segments[i];
elem= null;
- for (int k= 0; k < list.size(); k++) {
- Object curr= list.get(k);
+ for (Object curr : list) {
if (fProvider.isFolder(curr) && name.equals(fProvider.getLabel(curr))) {
elem= curr;
break;
@@ -852,8 +851,8 @@
public boolean hasChildren(Object element) {
List<?> list= fProvider.getChildren(element);
if (list != null) {
- for (int i= 0; i < list.size(); i++) {
- if (fProvider.isFolder(list.get(i))) {
+ for (Object element2 : list) {
+ if (fProvider.isFolder(element2)) {
return true;
}
}
@@ -869,8 +868,7 @@
List<?> list= fProvider.getChildren(element);
ArrayList<Object> res= new ArrayList<>();
if (list != null) {
- for (int i= 0; i < list.size(); i++) {
- Object curr= list.get(i);
+ for (Object curr : list) {
if (fProvider.isFolder(curr)) {
res.add(curr);
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickTemplateProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickTemplateProcessor.java
index d2a4f6d..f496d2a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickTemplateProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickTemplateProcessor.java
@@ -188,8 +188,7 @@
ASTNode[] selectedNodes= SurroundWith.getValidSelectedNodes(invocationContext);
Template[] templates= JavaPlugin.getDefault().getTemplateStore().getTemplates();
- for (int i= 0; i != templates.length; i++) {
- Template currentTemplate= templates[i];
+ for (Template currentTemplate : templates) {
if (canEvaluate(context, currentTemplate)) {
if (selectedNodes != null) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsSubProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsSubProcessor.java
index e9132c3..7d92984 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsSubProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsSubProcessor.java
@@ -223,8 +223,7 @@
}
private static Annotation findExistingAnnotation(List<? extends ASTNode> modifiers) {
- for (int i= 0, len= modifiers.size(); i < len; i++) {
- Object curr= modifiers.get(i);
+ for (ASTNode curr : modifiers) {
if (curr instanceof NormalAnnotation || curr instanceof SingleMemberAnnotation) {
Annotation annotation= (Annotation) curr;
ITypeBinding typeBinding= annotation.resolveTypeBinding();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaAutoIndentStrategy.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaAutoIndentStrategy.java
index 610a427..95ea2bb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaAutoIndentStrategy.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaAutoIndentStrategy.java
@@ -549,8 +549,8 @@
}
IProblem[] problems= compilationUnit.getProblems();
- for (int i= 0; i != problems.length; ++i) {
- if (problems[i].getID() == IProblem.UnmatchedBracket)
+ for (IProblem problem : problems) {
+ if (problem.getID() == IProblem.UnmatchedBracket)
return true;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/InclusivePositionUpdater.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/InclusivePositionUpdater.java
index 9b5449a..ef0ee37 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/InclusivePositionUpdater.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/InclusivePositionUpdater.java
@@ -52,9 +52,7 @@
try {
Position[] positions= event.getDocument().getPositions(fCategory);
- for (int i= 0; i != positions.length; i++) {
-
- Position position= positions[i];
+ for (Position position : positions) {
if (position.isDeleted())
continue;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateEngine.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateEngine.java
index 79c9a5c..aefa99a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateEngine.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateEngine.java
@@ -156,8 +156,7 @@
Template[] templates= JavaPlugin.getDefault().getTemplateStore().getTemplates();
boolean needsCheck= !isJava12OrHigherProject(compilationUnit);
if (selectedRange.y == 0) {
- for (int i= 0; i != templates.length; i++) {
- Template template= templates[i];
+ for (Template template : templates) {
if (canEvaluate(context, template, needsCheck)) {
fProposals.add(new TemplateProposal(template, context, region, getImage()));
}
@@ -170,14 +169,13 @@
boolean multipleLinesSelected= areMultipleLinesSelected(document, selectedRange);
- for (int i= 0; i != templates.length; i++) {
- Template template= templates[i];
+ for (Template template : templates) {
if (canEvaluate(context, template, needsCheck))
{
Matcher wordSelectionMatcher= $_WORD_SELECTION_PATTERN.matcher(template.getPattern());
Matcher lineSelectionMatcher= $_LINE_SELECTION_PATTERN.matcher(template.getPattern());
if ((!multipleLinesSelected && wordSelectionMatcher.find()) || (multipleLinesSelected && lineSelectionMatcher.find())) {
- fProposals.add(new TemplateProposal(templates[i], context, region, getImage()));
+ fProposals.add(new TemplateProposal(template, context, region, getImage()));
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateProposal.java
index 19452b7..ba3b571 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/template/contentassist/TemplateProposal.java
@@ -248,9 +248,7 @@
MultiVariableGuess guess= fContext instanceof JavaContext ? ((JavaContext) fContext).getMultiVariableGuess() : null;
boolean hasPositions= false;
- for (int i= 0; i != variables.length; i++) {
- TemplateVariable variable= variables[i];
-
+ for (TemplateVariable variable : variables) {
if (variable.isUnambiguous())
continue;
@@ -385,8 +383,7 @@
private int getCaretOffset(TemplateBuffer buffer) {
TemplateVariable[] variables= buffer.getVariables();
- for (int i= 0; i != variables.length; i++) {
- TemplateVariable variable= variables[i];
+ for (TemplateVariable variable : variables) {
if (variable.getType().equals(GlobalTemplateVariables.Cursor.NAME))
return variable.getOffsets()[0];
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
index 9e2361f..4d67b4b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
@@ -258,8 +258,7 @@
if (selElements.isEmpty()) {
return true;
}
- for (int i= 0; i < selElements.size(); i++) {
- Object elem= selElements.get(i);
+ for (Object elem : selElements) {
if (elem instanceof CPListElement) {
if (((CPListElement) elem).getParentContainer() != null) {
return false;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
index 76a2185..cce63c1 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
@@ -451,8 +451,8 @@
public void setSelection(List<?> selElements, boolean expand) {
fDetailsList.selectElements(new StructuredSelection(selElements));
if (expand) {
- for (int i= 0; i < selElements.size(); i++) {
- fDetailsList.expandElement(selElements.get(i), 1);
+ for (Object selElement : selElements) {
+ fDetailsList.expandElement(selElement, 1);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
index 192e48b..00ba2b8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
@@ -334,8 +334,8 @@
public void setSelection(List<?> selElements, boolean expand) {
fProjectsList.selectElements(new StructuredSelection(selElements));
if (expand) {
- for (int i= 0; i < selElements.size(); i++) {
- fProjectsList.expandElement(selElements.get(i), 1);
+ for (Object selElement : selElements) {
+ fProjectsList.expandElement(selElement, 1);
}
}
}
@@ -499,8 +499,7 @@
return false;
}
- for (int i= 0; i < selElements.size(); i++) {
- Object elem= selElements.get(i);
+ for (Object elem : selElements) {
if (elem instanceof CPListElementAttribute) {
CPListElementAttribute attrib= (CPListElementAttribute) elem;
if (IClasspathAttribute.MODULE.equals(attrib.getKey())) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
index 971095f..4af7868 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
@@ -635,8 +635,8 @@
public void setSelection(List<?> selElements, boolean expand) {
fFoldersList.selectElements(new StructuredSelection(selElements));
if (expand) {
- for (int i= 0; i < selElements.size(); i++) {
- fFoldersList.expandElement(selElements.get(i), 1);
+ for (Object selElement : selElements) {
+ fFoldersList.expandElement(selElement, 1);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/IncludeToBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/IncludeToBuildpathAction.java
index 1ac6a37..433a21b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/IncludeToBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/IncludeToBuildpathAction.java
@@ -125,8 +125,8 @@
monitor.beginTask(NewWizardMessages.ClasspathModifier_Monitor_Including, 2 * elements.size());
List<CPListElement> entries= ClasspathModifier.getExistingEntries(project);
- for (int i= 0; i < elements.size(); i++) {
- IResource resource= (IResource) elements.get(i);
+ for (Object element : elements) {
+ IResource resource= (IResource) element;
IPackageFragmentRoot root= ClasspathModifier.getFragmentRoot(resource, project, new SubProgressMonitor(monitor, 1));
if (root != null) {
CPListElement entry= ClasspathModifier.getClasspathEntry(entries, root);
diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/NonDeletingPositionUpdater.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/NonDeletingPositionUpdater.java
index 4acf333..5d0ba47 100644
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/NonDeletingPositionUpdater.java
+++ b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/NonDeletingPositionUpdater.java
@@ -48,9 +48,7 @@
try {
Position[] positions= event.getDocument().getPositions(fCategory);
- for (int i= 0; i != positions.length; i++) {
-
- Position position= positions[i];
+ for (Position position : positions) {
if (position.isDeleted())
continue;
