Cleanup in CachedCheckboxTreeViewer

Bug 462864
Change-Id: I520eca9f2b9ee400cfe0c089d369743266825c38
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

1 files changed, 16 insertions, 15 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CachedCheckboxTreeViewer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CachedCheckboxTreeViewer.java
index 18bb357d09..2cc169a985 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CachedCheckboxTreeViewer.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/CachedCheckboxTreeViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010, 2015 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *    Chris Aniszczyk <caniszczyk@gmail.com> - initial implementation
+ *    Lars Vogel <Lars.Vogel@vogella.com> - Bug 462864
  *******************************************************************************/
 package org.eclipse.egit.ui.internal.components;
 
@@ -70,8 +71,8 @@ public class CachedCheckboxTreeViewer extends ContainerCheckedTreeViewer {
 			if (contentProvider != null) {
 				Object[] children = contentProvider.getChildren(element);
 				if (children != null && children.length > 0) {
-					for (int i = 0; i < children.length; i++) {
-						updateCheckState(children[i], state);
+					for (Object child : children) {
+						updateCheckState(child, state);
 					}
 				} else {
 					checkState.add(element);
@@ -89,8 +90,8 @@ public class CachedCheckboxTreeViewer extends ContainerCheckedTreeViewer {
 			if (contentProvider != null) {
 				Object[] children = contentProvider.getChildren(element);
 				if (children !=null && children.length > 0) {
-					for (int i = 0; i < children.length; i++) {
-						updateCheckState(children[i], state);
+					for (Object child : children) {
+						updateCheckState(child, state);
 					}
 
 				}
@@ -200,13 +201,13 @@ public class CachedCheckboxTreeViewer extends ContainerCheckedTreeViewer {
 			}
 
 			if (contentProvider == null) {
-				for (int i = 0; i < visible.length; i++) {
-					checkState.add(visible[i]);
+				for (Object element : visible) {
+					checkState.add(element);
 				}
 			} else {
 				Set<Object> toCheck = new HashSet<Object>();
-				for (int i = 0; i < visible.length; i++) {
-					addFilteredChildren(visible[i], contentProvider, toCheck);
+				for (Object element : visible) {
+					addFilteredChildren(element, contentProvider, toCheck);
 				}
 				checkState.addAll(toCheck);
 			}
@@ -214,8 +215,8 @@ public class CachedCheckboxTreeViewer extends ContainerCheckedTreeViewer {
 			// Remove any item in the check state that is visible (passes the filters)
 			if (checkState != null) {
 				Object[] visible = filter(checkState.toArray());
-				for (int i = 0; i < visible.length; i++) {
-					checkState.remove(visible[i]);
+				for (Object element : visible) {
+					checkState.remove(element);
 				}
 			}
 		}
@@ -235,8 +236,8 @@ public class CachedCheckboxTreeViewer extends ContainerCheckedTreeViewer {
 			result.add(element);
 		} else {
 			Object[] visibleChildren = getFilteredChildren(element);
-			for (int i = 0; i < visibleChildren.length; i++) {
-				addFilteredChildren(visibleChildren[i], contentProvider, result);
+			for (Object visibleChild : visibleChildren) {
+				addFilteredChildren(visibleChild, contentProvider, result);
 			}
 		}
 	}
@@ -245,8 +246,8 @@ public class CachedCheckboxTreeViewer extends ContainerCheckedTreeViewer {
 	 * @see org.eclipse.jface.viewers.AbstractTreeViewer#remove(java.lang.Object[])
 	 */
 	public void remove(Object[] elementsOrTreePaths) {
-		for (int i = 0; i < elementsOrTreePaths.length; i++) {
-			updateCheckState(elementsOrTreePaths[i], false);
+		for (Object elementsOrTreePath : elementsOrTreePaths) {
+			updateCheckState(elementsOrTreePath, false);
 		}
 		super.remove(elementsOrTreePaths);
 	}