diff options
author | Carsten Hammer | 2019-05-26 17:58:04 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-06-13 18:03:31 +0000 |
commit | 45c0a30d7027df909b78fa167cf3da83488581d9 (patch) | |
tree | d38f0754453da55322ea62a1c2b82dfdca2652ae /org.eclipse.search.tests | |
parent | 8816cdaddd2f38ac3be6e6a70a0e8a683c772d83 (diff) | |
download | eclipse.platform.text-45c0a30d7027df909b78fa167cf3da83488581d9.tar.gz eclipse.platform.text-45c0a30d7027df909b78fa167cf3da83488581d9.tar.xz eclipse.platform.text-45c0a30d7027df909b78fa167cf3da83488581d9.zip |
Use jdk 5 for-each loopI20190614-0330I20190613-1800
Replace simple uses of Iterator with a corresponding for-each loop. Also
add missing braces on loops as necessary.
Change-Id: Ibde37d56a7962f432ed771f4a215f5903161bde0
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
Diffstat (limited to 'org.eclipse.search.tests')
7 files changed, 39 insertions, 39 deletions
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java index 5a30dad4b07..e3462a9ab2e 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java @@ -32,9 +32,10 @@ public class QueryManagerTest { InternalSearchUI.getInstance().addQuery(query); InternalSearchUI.getInstance().removeQuery(query); ISearchQuery[] all= InternalSearchUI.getInstance().getQueries(); - for (int i= 0; i < all.length; i++) { - if (query == all[i]) + for (ISearchQuery a : all) { + if (query == a) { assertTrue(false); + } } } @@ -43,9 +44,10 @@ public class QueryManagerTest { ISearchQuery query= new NullQuery(); InternalSearchUI.getInstance().addQuery(query); ISearchQuery[] all= NewSearchUI.getQueries(); - for (int i= 0; i < all.length; i++) { - if (query == all[i]) + for (ISearchQuery a : all) { + if (query == a) { return; + } } assertTrue(false); } diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java index 568f52df9ca..0cad8d1f578 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java @@ -85,8 +85,8 @@ public class AnnotationManagerTest { AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult(); Object[] files= result.getElements(); try { - for (int i= 0; i < files.length; i++) { - IFile file= (IFile)files[i]; + for (Object f : files) { + IFile file = (IFile) f; ITextEditor editor= (ITextEditor)SearchTestPlugin.openTextEditor(SearchPlugin.getActivePage(), file); IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); annotationModel.getAnnotationIterator(); @@ -128,8 +128,8 @@ public class AnnotationManagerTest { InternalSearchUI.getInstance().removeQuery(fQuery1); try { - for (int i= 0; i < files.length; i++) { - IFile file= (IFile)files[i]; + for (Object f : files) { + IFile file = (IFile) f; ITextEditor editor= (ITextEditor)SearchTestPlugin.openTextEditor(SearchPlugin.getActivePage(), file); IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); int annotationCount= 0; @@ -153,8 +153,8 @@ public class AnnotationManagerTest { Object[] files= result.getElements(); NewSearchUI.runQueryInForeground(null, fQuery2); try { - for (int i= 0; i < files.length; i++) { - IFile file= (IFile)files[i]; + for (Object f : files) { + IFile file = (IFile) f; ITextEditor editor= (ITextEditor)SearchTestPlugin.openTextEditor(SearchPlugin.getActivePage(), file); IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); int annotationCount= 0; @@ -182,8 +182,8 @@ public class AnnotationManagerTest { NewSearchUI.runQueryInForeground(null, fQuery2); SearchTestPlugin.getDefault().getSearchView().showSearchResult(result); try { - for (int i= 0; i < files.length; i++) { - IFile file= (IFile)files[i]; + for (Object f : files) { + IFile file = (IFile) f; ITextEditor editor= (ITextEditor)SearchTestPlugin.openTextEditor(SearchPlugin.getActivePage(), file); IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); int annotationCount= 0; diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java index 047a0dce457..887affd314b 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java @@ -516,8 +516,7 @@ public class FileSearchTests { private void assertMatches(TestResult[] results, int expectedCount, IFile file, String fileContent, String string) { int k= 0; - for (int i= 0; i < results.length; i++) { - TestResult curr= results[i]; + for (TestResult curr : results) { if (file.equals(curr.resource)) { k++; assertEquals("Wrong positions", string, fileContent.substring(curr.offset, curr.offset + curr.length)); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java index 0cfcfb16d9a..62f728658f1 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java @@ -81,8 +81,8 @@ public class LineAnnotationManagerTest { AbstractTextSearchResult result= (AbstractTextSearchResult) fLineQuery.getSearchResult(); Object[] files= result.getElements(); try { - for (int i= 0; i < files.length; i++) { - IFile file= (IFile) files[0]; + for (Object f : files) { + IFile file= (IFile) f; ITextEditor editor= (ITextEditor)SearchTestPlugin.openTextEditor(SearchPlugin.getActivePage(), file); IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput()); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java index a3ee6addbd9..65fd8ebf057 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java @@ -64,8 +64,8 @@ public class PositionTrackerTest { AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult(); Object[] elements= result.getElements(); try { - for (int i = 0; i < elements.length; i++) { - checkInsertAtZero(result, (IFile) elements[i]); + for (Object element : elements) { + checkInsertAtZero(result, (IFile) element); } } finally { SearchPlugin.getActivePage().closeAllEditors(false); @@ -78,8 +78,8 @@ public class PositionTrackerTest { FileSearchResult result= (FileSearchResult) fQuery1.getSearchResult(); Object[] elements= result.getElements(); try { - for (int i = 0; i < elements.length; i++) { - checkInsertInsideMatch(result, (IFile) elements[i]); + for (Object element : elements) { + checkInsertInsideMatch(result, (IFile) element); } } finally { SearchPlugin.getActivePage().closeAllEditors(false); @@ -94,14 +94,13 @@ public class PositionTrackerTest { ITextFileBuffer fb= FileBuffers.getTextFileBufferManager().getTextFileBuffer(file.getFullPath(), LocationKind.IFILE); IDocument doc= fb.getDocument(); - for (int i= 0; i < matches.length; i++) { - Position currentPosition= InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(matches[i]); + for (Match matche : matches) { + Position currentPosition = InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(matche); assertNotNull(currentPosition); doc.replace(currentPosition.offset + 1, 0, "Test"); } - - for (int i= 0; i < matches.length; i++) { - Position currentPosition= InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(matches[i]); + for (Match matche : matches) { + Position currentPosition = InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(matche); assertNotNull(currentPosition); String text= doc.get(currentPosition.offset, currentPosition.length); StringBuilder buf= new StringBuilder(); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java index ecf0290a1ab..feda1f39721 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java @@ -78,9 +78,9 @@ public class SearchResultPageTest { if (viewer instanceof AbstractTreeViewer) ((AbstractTreeViewer)viewer).expandAll(); Object[] elements= result.getElements(); - for (int i= 0; i < elements.length; i++) { + for (Object element : elements) { // make sure all elements in the test result are present in the viewer and have the proper count displayed - checkElementDisplay(viewer, result, elements[i]); + checkElementDisplay(viewer, result, element); } } @@ -98,12 +98,12 @@ public class SearchResultPageTest { viewer.expandAll(); Object[] elements= result.getElements(); //page.setUpdateTracing(true); - for (int i= 0; i < elements.length; i++) { - Match[] matches= result.getMatches(elements[i]); - viewer.reveal(elements[i]); - for (int j= 0; j < matches.length; j++) { - checkElementDisplay(viewer, result, elements[i]); - result.removeMatch(matches[j]); + for (Object element : elements) { + Match[] matches = result.getMatches(element); + viewer.reveal(element); + for (Match matche : matches) { + checkElementDisplay(viewer, result, element); + result.removeMatch(matche); consumeEvents(page); } } diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java index d18b70f80e3..ca15cbd9eb4 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java @@ -53,10 +53,10 @@ public class SortingTest { // first, collect all matches Object[] elements= result.getElements(); - for (int i= 0; i < elements.length; i++) { - Match[] matches= result.getMatches(elements[i]); - for (int j= 0; j < matches.length; j++) { - allMatches.add(matches[j]); + for (Object element : elements) { + Match[] matches = result.getMatches(element); + for (Match matche : matches) { + allMatches.add(matche); } } // now remove them and readd them in reverse order @@ -70,8 +70,8 @@ public class SortingTest { assertEquals("Test that all matches have been added again", result.getMatchCount(), originalMatchCount); // now check that they're ordered by position. - for (int i= 0; i < elements.length; i++) { - Match[] matches= result.getMatches(elements[i]); + for (Object element : elements) { + Match[] matches = result.getMatches(element); assertTrue("has matches", matches.length > 0); for (int j= 1; j < matches.length; j++) { assertTrue("order problem", isLessOrEqual(matches[j-1], matches[j])); |