Use jdk 5 for loop (tests)
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: Ib2210e8ca792ac31068284ae8507ee3b2009c65a
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/TestUnitPlistFileWriter.java b/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/TestUnitPlistFileWriter.java
index f6e78b1..2971443 100644
--- a/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/TestUnitPlistFileWriter.java
+++ b/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/internal/registration/TestUnitPlistFileWriter.java
@@ -278,8 +278,8 @@
private String getXml(String[] schemes) {
String snippets = "";
if (schemes != null) {
- for (int i = 0; i < schemes.length; i++) {
- snippets += getSchemeXmlSnippet(schemes[i]);
+ for (String scheme : schemes) {
+ snippets += getSchemeXmlSnippet(scheme);
}
}
return getPlistStartXmlSnippet() +
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/ArrayUtil.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/ArrayUtil.java
index 11ff2ec..e978c78 100644
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/ArrayUtil.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/ArrayUtil.java
@@ -44,9 +44,11 @@
public static boolean checkNotNull(Object[] array) {
if (array == null)
return false;
- for (int i = 0; i < array.length; i++)
- if (array[i] == null)
+ for (Object a : array) {
+ if (a == null) {
return false;
+ }
+ }
return true;
}
@@ -61,9 +63,11 @@
public static boolean contains(Object[] array, Object element) {
if (array == null || element == null)
return false;
- for (int i = 0; i < array.length; i++)
- if (array[i] == element)
+ for (Object a : array) {
+ if (a == element) {
return true;
+ }
+ }
return false;
}
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 097a2e2..a518658 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
@@ -507,8 +507,9 @@
*/
public void closeAllPages(IWorkbenchWindow window) {
IWorkbenchPage[] pages = window.getPages();
- for (int i = 0; i < pages.length; i++)
- pages[i].close();
+ for (IWorkbenchPage page : pages) {
+ page.close();
+ }
}
/**
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/internal/util/VerifyDialog.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/internal/util/VerifyDialog.java
index 44c44f8..169cedc 100644
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/internal/util/VerifyDialog.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/internal/util/VerifyDialog.java
@@ -172,8 +172,8 @@
group.setLayoutData(data);
int checkListSize = 0;
- for (int i = 0; i < _dialogTests.length; i++) {
- int size = _dialogTests[i].checkListTexts().size();
+ for (IDialogTestPass _dialogTest : _dialogTests) {
+ int size = _dialogTest.checkListTexts().size();
if (size > checkListSize) {
checkListSize = size;
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java
index 739bb52..69c01ef 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java
@@ -127,18 +127,16 @@
_actionService.setContext(new ActionContext(sel));
_actionService.fillContextMenu(mm);
- List<String> priorityItems = new ArrayList<String>();
+ List<String> priorityItems = new ArrayList<>();
IContributionItem[] items = mm.getItems();
- for (int i = 0; i < items.length; i++) {
- if (items[i] instanceof ActionContributionItem) {
- ActionContributionItem aci = (ActionContributionItem) items[i];
+ for (IContributionItem item : items) {
+ if (item instanceof ActionContributionItem) {
+ ActionContributionItem aci = (ActionContributionItem) item;
if (DEBUG) {
- System.out.println("action text: "
- + aci.getAction().getText());
+ System.out.println("action text: " + aci.getAction().getText());
}
- if (aci.getAction().getText().startsWith(
- TEST_ACTION_PROVIDER_PRIORITY))
+ if (aci.getAction().getText().startsWith(TEST_ACTION_PROVIDER_PRIORITY))
priorityItems.add(aci.getAction().getText());
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/INavigatorContentServiceTests.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/INavigatorContentServiceTests.java
index 305938d..689bf5d 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/INavigatorContentServiceTests.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/INavigatorContentServiceTests.java
@@ -145,9 +145,11 @@
INavigatorContentDescriptor[] visibleDescriptors = contentServiceWithProgrammaticBindings
.getVisibleExtensions();
boolean found = false;
- for (int i = 0; i < visibleDescriptors.length; i++)
- if (TEST_CONTENT2.equals(visibleDescriptors[i].getId()))
+ for (INavigatorContentDescriptor visibleDescriptor : visibleDescriptors) {
+ if (TEST_CONTENT2.equals(visibleDescriptor.getId())) {
found = true;
+ }
+ }
assertTrue("The programmatically bound extension should be bound.",
found);
@@ -180,12 +182,10 @@
assertEquals("There should be three visible extensions.", 3,
visibleIds.length);
- for (int i = 0; i < visibleIds.length; i++) {
- if (!TEST_CONTENT.equals(visibleIds[i])
- && !COMMON_NAVIGATOR_RESOURCE_EXT.equals(visibleIds[i])
- && !TEST_CONTENT_HAS_CHILDREN.equals(visibleIds[i])) {
- assertTrue("The extension id is invalid:" + visibleIds[i],
- false);
+ for (String visibleId : visibleIds) {
+ if (!TEST_CONTENT.equals(visibleId) && !COMMON_NAVIGATOR_RESOURCE_EXT.equals(visibleId)
+ && !TEST_CONTENT_HAS_CHILDREN.equals(visibleId)) {
+ assertTrue("The extension id is invalid:" + visibleId, false);
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java
index cf3948b..67b0402 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java
@@ -275,9 +275,9 @@
protected void clearAll() {
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
+ for (IProject project : projects) {
try {
- FileUtil.delete(projects[i]);
+ FileUtil.delete(project);
} catch (CoreException e) {
fail("Should not throw an exception");
}
@@ -296,8 +296,9 @@
// to refresh immediately and not wait for one that is scheduled to
// run.
TreeItem[] rootItems = _viewer.getTree().getItems();
- for (int i = 0; i < rootItems.length; i++)
- rootItems[i].setText("");
+ for (TreeItem rootItem : rootItems) {
+ rootItem.setText("");
+ }
} catch (Exception ex) {
// Ignore
}
@@ -310,16 +311,16 @@
_actionService.fillContextMenu(mm);
IContributionItem[] items = mm.getItems();
- for (int i = 0; i < items.length; i++) {
- if (items[i] instanceof MenuManager) {
- MenuManager childMm = (MenuManager) items[i];
+ for (IContributionItem item1 : items) {
+ if (item1 instanceof MenuManager) {
+ MenuManager childMm = (MenuManager) item1;
if (DEBUG) {
System.out.println("menu text: " + childMm.getMenuText());
}
if (childMm.getMenuText().indexOf(item) >= 0)
return childMm;
- } else if (items[i] instanceof ActionContributionItem) {
- ActionContributionItem aci = (ActionContributionItem) items[i];
+ } else if (item1 instanceof ActionContributionItem) {
+ ActionContributionItem aci = (ActionContributionItem) item1;
if (DEBUG) {
System.out.println("action text: " + aci.getAction().getText());
}
@@ -343,9 +344,9 @@
items = newMm.getItems();
}
- for (int i = 0; i < items.length; i++) {
- if (items[i] instanceof ActionContributionItem) {
- ActionContributionItem aci = (ActionContributionItem) items[i];
+ for (IContributionItem i : items) {
+ if (i instanceof ActionContributionItem) {
+ ActionContributionItem aci = (ActionContributionItem) i;
if (aci.getAction().getText().startsWith(item))
return true;
if (DEBUG)
@@ -368,19 +369,21 @@
}
protected void checkItems(TreeItem[] rootItems, TestLabelProvider tlp, boolean all, boolean text) {
- for (int i = 0; i < rootItems.length; i++) {
+ for (TreeItem rootItem : rootItems) {
// Skip the dummy items (for the + placeholder)
- if (rootItems[i].getText() == null || rootItems[i].getText().isEmpty())
+ if (rootItem.getText() == null || rootItem.getText().equals("")) {
continue;
- if (text && !rootItems[i].getText().startsWith(tlp.getColorName()))
- fail("Wrong text: " + rootItems[i].getText());
- assertEquals(tlp.backgroundColor, rootItems[i].getBackground(0));
- assertEquals(TestLabelProvider.toForegroundColor(tlp.backgroundColor), rootItems[i]
- .getForeground(0));
- assertEquals(tlp.font, rootItems[i].getFont(0));
- assertEquals(tlp.image, rootItems[i].getImage(0));
- if (all)
- checkItems(rootItems[i].getItems(), tlp, all, text);
+ }
+ if (text && !rootItem.getText().startsWith(tlp.getColorName())) {
+ fail("Wrong text: " + rootItem.getText());
+ }
+ assertEquals(tlp.backgroundColor, rootItem.getBackground(0));
+ assertEquals(TestLabelProvider.toForegroundColor(tlp.backgroundColor), rootItem.getForeground(0));
+ assertEquals(tlp.font, rootItem.getFont(0));
+ assertEquals(tlp.image, rootItem.getImage(0));
+ if (all) {
+ checkItems(rootItem.getItems(), tlp, all, text);
+ }
}
}
@@ -389,20 +392,19 @@
* name.
*/
protected TreeItem _findChild(String name, TreeItem[] items) {
- for (int i = 0; i < items.length; i++) {
- assertTrue("Child " + items[i] + " should be an M1 or M2 resource",
- items[i].getData() instanceof ResourceWrapper);
- ResourceWrapper rw = (ResourceWrapper) items[i].getData();
+ for (TreeItem item : items) {
+ assertTrue("Child " + item + " should be an M1 or M2 resource", item.getData() instanceof ResourceWrapper);
+ ResourceWrapper rw = (ResourceWrapper) item.getData();
if (name.equals(rw.getResource().getName())) {
- return items[i];
+ return item;
}
}
return null;
}
protected void _expand(TreeItem[] items) {
- for (int i = 0; i < items.length; i++) {
- _viewer.setExpandedState(items[i].getData(), true);
+ for (TreeItem item : items) {
+ _viewer.setExpandedState(item.getData(), true);
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/OpenTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/OpenTest.java
index 6e49af6..35bdc3f 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/OpenTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/OpenTest.java
@@ -58,8 +58,8 @@
TreeItem[] children = items[_projectInd].getItems();
assertEquals(_expectedChildren.size(), children.length);
- for (int i = 0; i < children.length; i++) {
- assertTrue(_expectedChildren.contains(children[i].getData()));
+ for (TreeItem child : children) {
+ assertTrue(_expectedChildren.contains(child.getData()));
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineTest.java
index b0e8efd..beb9d57 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineTest.java
@@ -82,10 +82,10 @@
TreeItem[] projectChildren = rootItems[_projectInd].getItems();
assertTrue("There should be some items.", projectChildren.length > 0); //$NON-NLS-1$
-
- for (int i = 0; i < projectChildren.length; i++) {
- if (projectChildren[i].getData() == sourceFolder)
+ for (TreeItem projectChild : projectChildren) {
+ if (projectChild.getData() == sourceFolder) {
fail("The src folder should not be added as an IFolder.");
+ }
}
// a new project without a Java nature should add without an issue.
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ProgrammaticOpenTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ProgrammaticOpenTest.java
index c3dc781..bf107c5 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ProgrammaticOpenTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ProgrammaticOpenTest.java
@@ -67,8 +67,8 @@
TreeItem[] children = items[_projectInd].getItems();
assertEquals(_expectedChildren.size(), children.length);
- for (int i = 0; i < children.length; i++) {
- assertTrue(_expectedChildren.contains(children[i].getData()));
+ for (TreeItem child : children) {
+ assertTrue(_expectedChildren.contains(child.getData()));
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/TestAccessHelper.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/TestAccessHelper.java
index 6091d45..3a710db 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/TestAccessHelper.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/TestAccessHelper.java
@@ -37,9 +37,8 @@
.getInstance().findRelevantActionDescriptors(contentService,
new ActionContext(new StructuredSelection()));
if (providerDescriptors.length > 0) {
- for (int i = 0; i < providerDescriptors.length; i++) {
- provider = actionService
- .getActionProviderInstance(providerDescriptors[i]);
+ for (CommonActionProviderDescriptor providerDescriptor : providerDescriptors) {
+ provider = actionService.getActionProviderInstance(providerDescriptor);
if (provider.getClass() == cls)
return provider;
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/WorkingSetTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/WorkingSetTest.java
index 9fe7771..6cf0432 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/WorkingSetTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/WorkingSetTest.java
@@ -246,9 +246,10 @@
ViewerFilter vf[];
vf = _viewer.getFilters();
boolean found = false;
- for (int i = 0; i < vf.length; i++) {
- if (vf[i] instanceof ResourceWorkingSetFilter)
+ for (ViewerFilter vf1 : vf) {
+ if (vf1 instanceof ResourceWorkingSetFilter) {
found = true;
+ }
}
assertTrue(found);
@@ -257,9 +258,10 @@
vf = _viewer.getFilters();
found = false;
- for (int i = 0; i < vf.length; i++) {
- if (vf[i] instanceof ResourceWorkingSetFilter)
+ for (ViewerFilter vf1 : vf) {
+ if (vf1 instanceof ResourceWorkingSetFilter) {
found = true;
+ }
}
assertTrue("Working set filter is gone, oh my!", found);
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElement.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElement.java
index daceb92..73a4045 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElement.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CElement.java
@@ -64,13 +64,14 @@
try {
if (_children.isEmpty() && _resource instanceof IContainer) {
IResource members[] = ((IContainer) _resource).members();
- for (int i = 0; i < members.length; i++) {
- if (members[i] instanceof IProject)
- _children.add(members[i]);
- else if (members[i] instanceof IFolder)
- _children.add(new CContainer(_cp, members[i], this));
- else
- _children.add(members[i]);
+ for (IResource member : members) {
+ if (member instanceof IProject) {
+ _children.add(member);
+ } else if (member instanceof IFolder) {
+ _children.add(new CContainer(_cp, member, this));
+ } else {
+ _children.add(member);
+ }
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorContentProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorContentProvider.java
index 00c43e1..5ab6fa9 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorContentProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CNavigatorContentProvider.java
@@ -132,8 +132,8 @@
public Object[] getElements(Object parent) {
if (parent instanceof IWorkspaceRoot) {
IProject[] projects = ((IWorkspaceRoot) parent).getProjects();
- for (int i = 0; i < projects.length; i++) {
- new CProject(this, projects[i], _root);
+ for (IProject project : projects) {
+ new CProject(this, project, _root);
}
return projects;
}
@@ -189,15 +189,15 @@
}
}
}
- for (int i = 0; i < cChildren.length; i++) {
- if (cChildren[i] instanceof CElement) {
- IResource resource = ((CElement) cChildren[i]).getResource();
+ for (Object cChild : cChildren) {
+ if (cChild instanceof CElement) {
+ IResource resource = ((CElement) cChild).getResource();
if (resource != null) {
proposedChildren.remove(resource);
}
- proposedChildren.add(cChildren[i]);
- } else if (cChildren[i] != null) {
- proposedChildren.add(cChildren[i]);
+ proposedChildren.add(cChild);
+ } else if (cChild != null) {
+ proposedChildren.add(cChild);
}
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CdtTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CdtTest.java
index cd78b18..466c649 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CdtTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CdtTest.java
@@ -66,9 +66,9 @@
_viewer.setExpandedState(project, true);
TreeItem[] rootItems = _viewer.getTree().getItems();
- for (int i = 0; i < rootItems.length; i++) {
- if (rootItems[i].getText().equals(CPROJECT_NAME)) {
- TreeItem[] items = rootItems[i].getItems();
+ for (TreeItem rootItem : rootItems) {
+ if (rootItem.getText().equals(CPROJECT_NAME)) {
+ TreeItem[] items = rootItem.getItems();
assertEquals("CL: CElement: Debug", items[0].getText());
assertEquals("CL: CElement: src", items[1].getText());
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaLibraries.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaLibraries.java
index 329995b..2d03137 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaLibraries.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaLibraries.java
@@ -45,18 +45,16 @@
List classpathContainers = new ArrayList();
Object[] delegateChildren = delegateContentProvider
.getChildren(compressedProject.getProject());
- for (int i = 0; i < delegateChildren.length; i++) {
- if (WebJavaContentProvider.IPACKAGE_FRAGMENT_ROOT_CLASS
- .isInstance(delegateChildren[i])) {
+ for (Object delegateChild : delegateChildren) {
+ if (WebJavaContentProvider.IPACKAGE_FRAGMENT_ROOT_CLASS.isInstance(delegateChild)) {
try {
- classpathContainers.add(delegateChildren[i]);
+ classpathContainers.add(delegateChild);
} catch (Exception e) {
}
- } else if (!WebJavaContentProvider.IJAVA_ELEMENT_CLASS
- .isInstance(delegateChildren[i])
- && !(delegateChildren[i] instanceof IResource)) {
- classpathContainers.add(delegateChildren[i]);
+ } else if (!WebJavaContentProvider.IJAVA_ELEMENT_CLASS.isInstance(delegateChild)
+ && !(delegateChild instanceof IResource)) {
+ classpathContainers.add(delegateChild);
}
}
return classpathContainers.toArray();
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
index 3c3a9de..f652f4e 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
@@ -107,19 +107,19 @@
// and 3a) `charset.jar` if the java project uses JRE of java8 or below
// or 3b) `java.base` if the java project uses JRE of java9 or above
// and checks if the ContentProvider and LabelProvider are working as expected.
- for (int i = 0; i < projectChildren.length; i++) {
- if (projectChildren[i].getText().startsWith("Compressed Java")) {
+ for (TreeItem projectChild : projectChildren) {
+ if (projectChild.getText().startsWith("Compressed Java")) {
foundJava = true;
- _viewer.setExpandedState(projectChildren[i].getData(), true);
-
- TreeItem[] srcChildren = projectChildren[i].getItems();
- for (int j = 0; j < srcChildren.length; j++) {
- if (srcChildren[j].getText().startsWith(
- "Compressed Libraries"))
+ _viewer.setExpandedState(projectChild.getData(), true);
+ TreeItem[] srcChildren = projectChild.getItems();
+ for (TreeItem srcChild : srcChildren) {
+ if (srcChild.getText().startsWith("Compressed Libraries")) {
foundCompressedLibrary = true;
- if (srcChildren[j].getText().startsWith("charsets.jar")
- || srcChildren[j].getText().startsWith("java.base"))
+ }
+ if (srcChild.getText().startsWith("charsets.jar")
+ || srcChild.getText().startsWith("java.base")) {
foundJavaLibrary = true;
+ }
}
}
}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/util/ProjectUnzipUtil.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/util/ProjectUnzipUtil.java
index 32281d7..ecc5161 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/util/ProjectUnzipUtil.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/util/ProjectUnzipUtil.java
@@ -143,13 +143,11 @@
}
private void buildProjects() throws IOException, CoreException {
- for (int i = 0; i < projectNames.length; i++) {
-
+ for (String projectName : projectNames) {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
-
- IPath projectPath = new Path("/" + projectNames[i] + "/" + META_PROJECT_NAME); //$NON-NLS-1$//$NON-NLS-2$
+ IPath projectPath = new Path("/" + projectName + "/" + META_PROJECT_NAME); //$NON-NLS-1$//$NON-NLS-2$
IPath path = rootLocation.append(projectPath);
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectNames[i]);
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
IProjectDescription description = workspace.loadProjectDescription(path);
project.create(description, (getProgessMonitor()));
project.open(getProgessMonitor());
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FastTreeTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FastTreeTest.java
index aa69921..61782e7 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FastTreeTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FastTreeTest.java
@@ -96,8 +96,8 @@
startMeasuring();
for (int i = 0; i < 10; i++) {
viewer.remove(input.children);
- for (int k = 0; k < batchArray.length; k++) {
- viewer.add(input, (Object[]) batchArray[k]);
+ for (Object batch : batchArray) {
+ viewer.add(input, (Object[]) batch);
processEvents();
}
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FileImageDescriptorTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FileImageDescriptorTest.java
index 0a04c77..ab22b6f 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FileImageDescriptorTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FileImageDescriptorTest.java
@@ -76,15 +76,12 @@
URL[] files = FileLocator.findEntries(bundle, new Path(
localImagePath));
- for (int i = 0; i < files.length; i++) {
-
+ for (URL file : files) {
startMeasuring();
-
try {
- descriptor = ImageDescriptor.createFromFile(missing,
- FileLocator.toFileURL(files[i]).getFile());
+ descriptor = ImageDescriptor.createFromFile(missing, FileLocator.toFileURL(file).getFile());
} catch (IOException e) {
- fail(e.getLocalizedMessage(),e);
+ fail(e.getLocalizedMessage(), e);
continue;
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ListPopulationTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ListPopulationTest.java
index 981a319..3cca769 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ListPopulationTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ListPopulationTest.java
@@ -89,8 +89,8 @@
public void run() {
list.removeAll();
startMeasuring();
- for (int j = 0; j < items.length; j++) {
- list.add(items[j]);
+ for (String item : items) {
+ list.add(item);
}
processEvents();
stopMeasuring();
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TreeAddTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TreeAddTest.java
index bd29a7f..46058cd 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TreeAddTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TreeAddTest.java
@@ -45,11 +45,9 @@
input.createChildren(TEST_COUNT);
processEvents();
startMeasuring();
- for (int j = 0; j < input.children.length; j++) {
-
- viewer.add(input, input.children[j]);
+ for (TestTreeElement child : input.children) {
+ viewer.add(input, child);
processEvents();
-
}
stopMeasuring();
}
@@ -121,8 +119,8 @@
startMeasuring();
// Measure more than one for the fast cases
- for (int k = 0; k < batchArray.length; k++) {
- viewer.add(input, (Object[]) batchArray[k]);
+ for (Object batch : batchArray) {
+ viewer.add(input, (Object[]) batch);
processEvents();
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorPerformanceSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorPerformanceSuite.java
index 4bde89f..46c2a5b 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorPerformanceSuite.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorPerformanceSuite.java
@@ -56,8 +56,8 @@
*
*/
private void addSwitchScenarios() {
- for (int i = 0; i < EDITOR_SWITCH_PAIRS.length; i++) {
- addTest(new EditorSwitchTest(EDITOR_SWITCH_PAIRS[i]));
+ for (String[] EDITOR_SWITCH_PAIR : EDITOR_SWITCH_PAIRS) {
+ addTest(new EditorSwitchTest(EDITOR_SWITCH_PAIR));
}
}
@@ -65,8 +65,8 @@
*
*/
private void addOpenMultipleScenarios(boolean closeAll) {
- for (int i = 0; i < EDITOR_FILE_EXTENSIONS.length; i++) {
- addTest(new OpenMultipleEditorTest(EDITOR_FILE_EXTENSIONS[i], closeAll, BasicPerformanceTest.NONE));
+ for (String EDITOR_FILE_EXTENSION : EDITOR_FILE_EXTENSIONS) {
+ addTest(new OpenMultipleEditorTest(EDITOR_FILE_EXTENSION, closeAll, BasicPerformanceTest.NONE));
}
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java
index e23157a..5d0be7d 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java
@@ -133,16 +133,15 @@
public static boolean isCalm() {
IJobManager jobManager = Job.getJobManager();
Job[] jobs= jobManager.find(null);
- for (int i= 0; i < jobs.length; i++) {
- Job job= jobs[i];
- int state= job.getState();
-// System.out.println(job.getName() + ": " + getStateName(state));
+ for (Job job : jobs) {
+ int state = job.getState();
+ // System.out.println(job.getName() + ": " + getStateName(state));
if (state == Job.RUNNING || state == Job.WAITING) {
-// System.out.println();
+ // System.out.println();
return false;
}
}
-// System.out.println();
+ // System.out.println();
return true;
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/GenerateIdentifiersTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/GenerateIdentifiersTest.java
index 837a73c..12fb308 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/GenerateIdentifiersTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/GenerateIdentifiersTest.java
@@ -44,8 +44,8 @@
}
startMeasuring();
- for(int i = 0; i < ids.length; i++) {
- activityManager.getIdentifier(ids[i]);
+ for (String id : ids) {
+ activityManager.getIdentifier(id);
}
stopMeasuring();
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ObjectContributionTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ObjectContributionTest.java
index 567168c..a58626f 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ObjectContributionTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ObjectContributionTest.java
@@ -412,8 +412,7 @@
final IContributionItem[] items = fakeMenuManager.getItems();
Set<String> seenCommands = new HashSet<>(Arrays.asList(commandIds));
List<String> commands = new ArrayList<>(Arrays.asList(commandIds));
- for (int i = 0; i < items.length; i++) {
- IContributionItem contributionItem = items[i];
+ for (IContributionItem contributionItem : items) {
// Step 1: test the selection
if (selectionType != null) {
IContributionItem item = contributionItem;
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenClosePerspectiveTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenClosePerspectiveTest.java
index 4998fec..0658602 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenClosePerspectiveTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenClosePerspectiveTest.java
@@ -80,8 +80,8 @@
}
closePerspective(activePage);
//populate the empty perspective with all view that will be shown in the test view
- for (int i = 0; i < ids.length; i++) {
- activePage.showView(ids[i]);
+ for (String i : ids) {
+ activePage.showView(i);
}
tagIfNecessary("UI - Open/Close " + perspective1.getLabel() + " Perspective", Dimension.ELAPSED_PROCESS);
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenMultipleEditorTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenMultipleEditorTest.java
index e82bb4b..4cd8b88 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenMultipleEditorTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/OpenMultipleEditorTest.java
@@ -57,8 +57,8 @@
}
else {
IEditorPart [] parts = activePage.getEditors();
- for (int i = 0; i < parts.length; i++) {
- activePage.closeEditor(parts[i], false);
+ for (IEditorPart part : parts) {
+ activePage.closeEditor(part, false);
}
}
stopMeasuring();
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ProblemsViewPerformanceTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ProblemsViewPerformanceTest.java
index c6b3a00..1f5d5c6 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ProblemsViewPerformanceTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ProblemsViewPerformanceTest.java
@@ -97,12 +97,10 @@
IMarker[] markers = root.findMarkers(IMarker.PROBLEM, false,
IResource.DEPTH_ZERO);
- for (int i = 0; i < markers.length; i++) {
- String message = (String) markers[i]
- .getAttribute(IMarker.MESSAGE);
-
+ for (IMarker marker : markers) {
+ String message = (String) marker.getAttribute(IMarker.MESSAGE);
if (message != null && message.startsWith("this is a test")) {
- markers[i].delete();
+ marker.delete();
}
}
} catch (CoreException e) {
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 80e10b0..2c29e07 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
@@ -102,8 +102,8 @@
projectDescription.setBuildSpec(new ICommand[] { buildCommand });
testProject.setDescription(projectDescription, null);*/
- for (int i = 0; i < EditorPerformanceSuite.EDITOR_FILE_EXTENSIONS.length; i++) {
- createFiles(EditorPerformanceSuite.EDITOR_FILE_EXTENSIONS[i]);
+ for (String EDITOR_FILE_EXTENSION : EditorPerformanceSuite.EDITOR_FILE_EXTENSIONS) {
+ createFiles(EDITOR_FILE_EXTENSION);
}
}
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ViewPerformanceSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ViewPerformanceSuite.java
index 68f0dd3..0878b7c 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ViewPerformanceSuite.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ViewPerformanceSuite.java
@@ -57,21 +57,16 @@
private void addOpenCloseTests() {
String[] ids = getAllTestableViewIds();
- for (int i = 0; i < ids.length; i++) {
- String id = ids[i];
-
+ for (String id : ids) {
addTest(new OpenCloseViewTest(id,
- id.equals(PROJECT_EXPLORER) ? BasicPerformanceTest.GLOBAL
- : BasicPerformanceTest.NONE));
+ id.equals(PROJECT_EXPLORER) ? BasicPerformanceTest.GLOBAL : BasicPerformanceTest.NONE));
}
}
private void addResizeTests() {
String[] ids = getAllTestableViewIds();
- for (int i = 0; i < ids.length; i++) {
- String id = ids[i];
-
+ for (String id : ids) {
addTest(new ResizeTest(new ViewWidgetFactory(id)));
}
@@ -82,24 +77,18 @@
IViewDescriptor[] descriptors = PlatformUI.getWorkbench()
.getViewRegistry().getViews();
- for (int i = 0; i < descriptors.length; i++) {
- IViewDescriptor descriptor = descriptors[i];
-
+ for (IViewDescriptor descriptor : descriptors) {
String[] categoryPath = descriptor.getCategoryPath();
-
if (categoryPath == null)
continue;
-
- for (int j = 0; j < categoryPath.length; j++) {
+ for (String categoryPath1 : categoryPath) {
// Only test basic views
- if (categoryPath[j].equals(BASIC_PATH)) {
- if (descriptor.getId().indexOf(VIEWS_PATTERN) >= 0
- || descriptor.getId().equals(PROJECT_EXPLORER)) {
+ if (categoryPath1.equals(BASIC_PATH)) {
+ if (descriptor.getId().indexOf(VIEWS_PATTERN) >= 0 || descriptor.getId().equals(PROJECT_EXPLORER)) {
result.add(descriptor.getId());
}
}
}
-
}
return result.toArray(new String[result.size()]);
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java
index 3d28abe..64e6b0e 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java
@@ -105,8 +105,8 @@
*
*/
private void addWindowOpenCloseScenarios() {
- for (int i = 0; i < PERSPECTIVE_IDS.length; i++) {
- addTest(new OpenCloseWindowTest(PERSPECTIVE_IDS[i], BasicPerformanceTest.NONE));
+ for (String PERSPECTIVE_ID : PERSPECTIVE_IDS) {
+ addTest(new OpenCloseWindowTest(PERSPECTIVE_ID, BasicPerformanceTest.NONE));
}
}
@@ -124,8 +124,8 @@
*
*/
private void addPerspectiveSwitchScenarios() {
- for (int i = 0; i < PERSPECTIVE_SWITCH_PAIRS.length; i++) {
- addTest(new PerspectiveSwitchTest(PERSPECTIVE_SWITCH_PAIRS[i], BasicPerformanceTest.NONE));
+ for (String[] PERSPECTIVE_SWITCH_PAIR : PERSPECTIVE_SWITCH_PAIRS) {
+ addTest(new PerspectiveSwitchTest(PERSPECTIVE_SWITCH_PAIR, BasicPerformanceTest.NONE));
}
}
@@ -136,8 +136,7 @@
ArrayList<String> result = new ArrayList<>();
IPerspectiveDescriptor[] perspectives = PlatformUI.getWorkbench().getPerspectiveRegistry().getPerspectives();
- for (int i = 0; i < perspectives.length; i++) {
- IPerspectiveDescriptor descriptor = perspectives[i];
+ for (IPerspectiveDescriptor descriptor : perspectives) {
String id = descriptor.getId();
result.add(id);
}
@@ -150,11 +149,10 @@
*/
private void addResizeScenarios() {
String[] perspectiveIds = getAllPerspectiveIds();
- for (int i = 0; i < perspectiveIds.length; i++) {
- String id = perspectiveIds[i];
+ for (String id : perspectiveIds) {
addTest(new ResizeTest(new PerspectiveWidgetFactory(id),
id.equals(resizeFingerprintTest) ? BasicPerformanceTest.LOCAL : BasicPerformanceTest.NONE,
- "UI - Workbench Window Resize"));
+ "UI - Workbench Window Resize"));
}
}
}
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/TabbedPropertySheetPageDynamicTest.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/TabbedPropertySheetPageDynamicTest.java
index fba2903..913d193 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/TabbedPropertySheetPageDynamicTest.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/TabbedPropertySheetPageDynamicTest.java
@@ -16,8 +16,6 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.widgets.Display;
@@ -34,6 +32,8 @@
import org.eclipse.ui.tests.views.properties.tabbed.views.TestsPerspective;
import org.eclipse.ui.views.properties.tabbed.ITabDescriptor;
+import junit.framework.TestCase;
+
/**
* Tests for the dynamic tab and section support.
*
@@ -147,11 +147,10 @@
*/
public void select_all_blue() {
List blueList = new ArrayList();
- for (int i = 0; i < treeNodes.length; i++) {
- if (DynamicTestsColor.BLUE.equals(treeNodes[i]
- .getDynamicTestsElement().getPropertyValue(
- DynamicTestsElement.ID_COLOR))) {
- blueList.add(treeNodes[i]);
+ for (DynamicTestsTreeNode treeNode : treeNodes) {
+ if (DynamicTestsColor.BLUE
+ .equals(treeNode.getDynamicTestsElement().getPropertyValue(DynamicTestsElement.ID_COLOR))) {
+ blueList.add(treeNode);
}
}
DynamicTestsTreeNode[] selectNodes = (DynamicTestsTreeNode[]) blueList
@@ -207,11 +206,10 @@
*/
public void select_all_triangle() {
List triangleList = new ArrayList();
- for (int i = 0; i < treeNodes.length; i++) {
- if (DynamicTestsShape.TRIANGLE.equals(treeNodes[i]
- .getDynamicTestsElement().getPropertyValue(
- DynamicTestsElement.ID_SHAPE))) {
- triangleList.add(treeNodes[i]);
+ for (DynamicTestsTreeNode treeNode : treeNodes) {
+ if (DynamicTestsShape.TRIANGLE
+ .equals(treeNode.getDynamicTestsElement().getPropertyValue(DynamicTestsElement.ID_SHAPE))) {
+ triangleList.add(treeNode);
}
}
DynamicTestsTreeNode[] selectNodes = (DynamicTestsTreeNode[]) triangleList
@@ -286,11 +284,10 @@
*/
public void select_blackTriangle() {
DynamicTestsTreeNode blackTriangleNode = null;
- for (int i = 0; i < treeNodes.length; i++) {
- if (DynamicTestsColor.BLACK.equals(treeNodes[i]
- .getDynamicTestsElement().getPropertyValue(
- DynamicTestsElement.ID_COLOR))) {
- blackTriangleNode = treeNodes[i];
+ for (DynamicTestsTreeNode treeNode : treeNodes) {
+ if (DynamicTestsColor.BLACK
+ .equals(treeNode.getDynamicTestsElement().getPropertyValue(DynamicTestsElement.ID_COLOR))) {
+ blackTriangleNode = treeNode;
break;
}
}
@@ -376,11 +373,10 @@
*/
public void select_RedStar() {
DynamicTestsTreeNode redStarNode = null;
- for (int i = 0; i < treeNodes.length; i++) {
- if (DynamicTestsShape.STAR.equals(treeNodes[i]
- .getDynamicTestsElement().getPropertyValue(
- DynamicTestsElement.ID_SHAPE))) {
- redStarNode = treeNodes[i];
+ for (DynamicTestsTreeNode treeNode : treeNodes) {
+ if (DynamicTestsShape.STAR
+ .equals(treeNode.getDynamicTestsElement().getPropertyValue(DynamicTestsElement.ID_SHAPE))) {
+ redStarNode = treeNode;
break;
}
}
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/decorations/TabbedPropertySheetPageWithDecorations.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/decorations/TabbedPropertySheetPageWithDecorations.java
index 40e96d4..0dcc721 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/decorations/TabbedPropertySheetPageWithDecorations.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/decorations/TabbedPropertySheetPageWithDecorations.java
@@ -137,13 +137,13 @@
private Map getImageDecorationsForTabs(ITabItem[] tabItems) {
Map tabToImageDecorationsMap = new HashMap();
- for (int i = 0; i < tabItems.length; i++) {
- if (tabItems[i].getText().equals("Name")) {
- tabToImageDecorationsMap.put(tabItems[i], Integer.valueOf(5));
- } else if (tabItems[i].getText().equals("Message")) {
- tabToImageDecorationsMap.put(tabItems[i], Integer.valueOf(3));
+ for (ITabItem tabItem : tabItems) {
+ if (tabItem.getText().equals("Name")) {
+ tabToImageDecorationsMap.put(tabItem, Integer.valueOf(5));
+ } else if (tabItem.getText().equals("Message")) {
+ tabToImageDecorationsMap.put(tabItem, Integer.valueOf(3));
} else {
- tabToImageDecorationsMap.put(tabItems[i], Integer.valueOf(0));
+ tabToImageDecorationsMap.put(tabItem, Integer.valueOf(0));
}
}
return tabToImageDecorationsMap;
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/OverrideTestsView.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/OverrideTestsView.java
index ec25d5a..c4e934d 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/OverrideTestsView.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/OverrideTestsView.java
@@ -126,13 +126,11 @@
if (elementClass == null) {
viewer.setSelection(StructuredSelection.EMPTY);
}
- Object[] elements = overrideTestsContentProvider.getElements(null);
- for (int i = 0; i < elements.length; i++) {
- Element element = (Element) elements[i];
+ Element[] elements = (Element[]) overrideTestsContentProvider.getElements(null);
+ for (Element element : elements) {
Class clazz = element.getClass();
if (elementClass == clazz) {
- StructuredSelection newSelection = new StructuredSelection(
- element);
+ StructuredSelection newSelection = new StructuredSelection(element);
viewer.setSelection(newSelection);
break;
}
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/folders/AbstractTabFolder.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/folders/AbstractTabFolder.java
index 89af45d..f6b8ea8 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/folders/AbstractTabFolder.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/folders/AbstractTabFolder.java
@@ -64,13 +64,13 @@
IOverrideTestsItem[] items = getItem();
- for (int i = 0; i < items.length; i++) {
+ for (IOverrideTestsItem item : items) {
CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
- items[i].createControls(tabFolder);
- tabItem.setText(items[i].getText());
- tabItem.setImage(items[i].getImage());
- tabItem.setControl(items[i].getComposite());
- tabItem.setData(items[i]);
+ item.createControls(tabFolder);
+ tabItem.setText(item.getText());
+ tabItem.setImage(item.getImage());
+ tabItem.setControl(item.getComposite());
+ tabItem.setData(item);
}
tabFolder.setSelection(0);
@@ -79,11 +79,9 @@
@Override
public void widgetSelected(SelectionEvent e) {
CTabItem aTabItem = (CTabItem) e.item;
- Object[] listeners = itemSelectionListeners.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- IOverrideTestsTabItemSelectionListener listener = (IOverrideTestsTabItemSelectionListener) listeners[i];
- listener.itemSelected((IOverrideTestsItem) aTabItem
- .getData());
+ IOverrideTestsTabItemSelectionListener[] listeners = (IOverrideTestsTabItemSelectionListener[]) itemSelectionListeners.getListeners();
+ for (IOverrideTestsTabItemSelectionListener listener : listeners) {
+ listener.itemSelected((IOverrideTestsItem) aTabItem.getData());
}
}
});
@@ -103,10 +101,8 @@
@Override
public void selectionChanged(Element element) {
CTabItem[] items = tabFolder.getItems();
- for (int i = 0; i < items.length; i++) {
- CTabItem tabItem = items[i];
- if (((IOverrideTestsItem) tabItem.getData()).getText().equals(
- element.getName())) {
+ for (CTabItem tabItem : items) {
+ if (((IOverrideTestsItem) tabItem.getData()).getText().equals(element.getName())) {
tabFolder.setSelection(tabItem);
}
}
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/folders/OverrideTestsTabFolderPropertySheetPageContentManager.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/folders/OverrideTestsTabFolderPropertySheetPageContentManager.java
index c809aa4..f4c839c 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/folders/OverrideTestsTabFolderPropertySheetPageContentManager.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/folders/OverrideTestsTabFolderPropertySheetPageContentManager.java
@@ -77,9 +77,9 @@
if (element == null) {
newFolder = emptyFolder;
} else {
- for (int i = 0; i < folders.length; i++) {
- if (folders[i].appliesTo(element)) {
- newFolder = folders[i];
+ for (IOverrideTestsTabFolder folder : folders) {
+ if (folder.appliesTo(element)) {
+ newFolder = folder;
break;
}
}
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/tablist/OverrideTestsTabListsContentsManager.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/tablist/OverrideTestsTabListsContentsManager.java
index 9b5c8b1..7353ecc 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/tablist/OverrideTestsTabListsContentsManager.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/override/tablist/OverrideTestsTabListsContentsManager.java
@@ -17,9 +17,9 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.tests.views.properties.tabbed.model.Element;
import org.eclipse.ui.tests.views.properties.tabbed.override.OverrideTestsSelection;
import org.eclipse.ui.tests.views.properties.tabbed.override.OverrideTestsView;
-import org.eclipse.ui.tests.views.properties.tabbed.model.Element;
import org.eclipse.ui.views.properties.tabbed.ISection;
import org.eclipse.ui.views.properties.tabbed.ITabItem;
import org.eclipse.ui.views.properties.tabbed.TabContents;
@@ -130,9 +130,9 @@
if (newElement == null) {
newFolder = emptyFolder;
} else {
- for (int i = 0; i < folders.length; i++) {
- if (folders[i].appliesTo(newElement)) {
- newFolder = folders[i];
+ for (IOverrideTestsTabList folder : folders) {
+ if (folder.appliesTo(newElement)) {
+ newFolder = folder;
break;
}
}
@@ -196,8 +196,8 @@
if (tab != null) {
ISection[] sections = tab.getSections();
if (sections != null) {
- for (int i = 0; i < sections.length; i++) {
- if (sections[i] == section) {
+ for (ISection sec : sections) {
+ if (sec == section) {
return true;
}
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
index 5751c1f..1f1f59f 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
@@ -346,10 +346,10 @@
//Check that all states are properly set
checkAllStates("Testing checkbox state with a sorter", ctv, 0);
- //Check that the provider is only invoked on elements which pass the filter
- for (Iterator<TestElement> i = checkStateProvider.isCheckedInvokedOn.iterator(); i.hasNext();) {
- TestElement element = i.next();
- assertTrue("The check provider should not be invoked on elements which did not get through the filter", filter.select(ctv, null, element));
+ // Check that the provider is only invoked on elements which pass the filter
+ for (TestElement element : checkStateProvider.isCheckedInvokedOn) {
+ assertTrue("The check provider should not be invoked on elements which did not get through the filter",
+ filter.select(ctv, null, element));
}
for (Iterator<TestElement> i = checkStateProvider.isGrayedInvokedOn.iterator(); i.hasNext();) {
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
index a86f48d..74a90d9 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
@@ -1185,9 +1185,9 @@
ProjectRecord[] projectRecords = newWizard.getProjectRecords();
List<String> projectNames = new ArrayList<>();
- for (int i = 0; i < projectRecords.length; i++) {
- if(!projectRecords[i].hasConflicts()) {
- projectNames.add(projectRecords[i].getProjectName());
+ for (ProjectRecord projectRecord : projectRecords) {
+ if (!projectRecord.hasConflicts()) {
+ projectNames.add(projectRecord.getProjectName());
}
}
return projectNames;
@@ -1251,9 +1251,9 @@
private List<String> getValidProjects(ProjectRecord[] projectRecords) {
List<String> projectNames = new ArrayList<>();
- for (int i = 0; i < projectRecords.length; i++) {
- if (!projectRecords[i].isInvalidProject()) {
- projectNames.add(projectRecords[i].getProjectName());
+ for (ProjectRecord projectRecord : projectRecords) {
+ if (!projectRecord.isInvalidProject()) {
+ projectNames.add(projectRecord.getProjectName());
}
}
return projectNames;
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java
index 74fdb21..2f4d0aa 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java
@@ -206,10 +206,9 @@
// a CoolBarManager and it contains only separators or invisible
// objects.
IContributionItem[] items = manager.getItems();
- for (int i = 0; i < items.length; i++) {
- if (!(items[i] instanceof Separator) && items[i].isVisible()) {
- fail("No toolbar for a visible action text \"" + actionText
- + "\"");
+ for (IContributionItem item : items) {
+ if (!(item instanceof Separator) && item.isVisible()) {
+ fail("No toolbar for a visible action text \"" + actionText + "\"");
}
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/WorkspaceOperationsTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/WorkspaceOperationsTests.java
index 4904e1f..6626f3e 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/WorkspaceOperationsTests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/WorkspaceOperationsTests.java
@@ -214,8 +214,8 @@
if (!contentMatch) {
return false;
}
- for (int i = 0; i < markerSnapshots.length; i++) {
- if (!markerSnapshots[i].existsOn(resource)) {
+ for (MarkerSnapshot markerSnapshot : markerSnapshots) {
+ if (!markerSnapshot.existsOn(resource)) {
return false;
}
}
@@ -253,9 +253,9 @@
return false;
}
}
- for (int i = 0; i < memberSnapshots.length; i++) {
- if (!fileNameExcludes.contains(memberSnapshots[i].name)) {
- if (!memberSnapshots[i].isValid(folder)) {
+ for (ResourceSnapshot memberSnapshot : memberSnapshots) {
+ if (!fileNameExcludes.contains(memberSnapshot.name)) {
+ if (!memberSnapshot.isValid(folder)) {
return false;
}
}
@@ -322,9 +322,9 @@
project.open(null);
}
- for (int i = 0; i < memberSnapshots.length; i++) {
- if (!fileNameExcludes.contains(memberSnapshots[i].name)) {
- if (!memberSnapshots[i].isValid(resource)) {
+ for (ResourceSnapshot memberSnapshot : memberSnapshots) {
+ if (!fileNameExcludes.contains(memberSnapshot.name)) {
+ if (!memberSnapshot.isValid(resource)) {
return false;
}
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogUtil.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogUtil.java
index ae510cd..4d5a7ec 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogUtil.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusDialogUtil.java
@@ -67,12 +67,11 @@
public static Shell getStatusShellImmediately() {
Shell[] shells = Display.getDefault().getShells();
- for (int i = 0; i < shells.length; i++) {
- if (shells[i].getText().equals("Problem Occurred")
- || shells[i].getText().equals(
- "Multiple problems have occurred")) {
- if (!shells[i].isDisposed()) {
- return shells[i];
+ for (Shell shell : shells) {
+ if (shell.getText().equals("Problem Occurred")
+ || shell.getText().equals("Multiple problems have occurred")) {
+ if (!shell.isDisposed()) {
+ return shell;
}
}
}
