Replace iterators with enhanced for loops (#10018)

This change also includes some other minor cleanup.

3 files changed, 5 insertions, 12 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
index d92a17f4b8..e978a08119 100644
--- a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
@@ -339,9 +339,7 @@ public class VCustomLayout extends ComplexPanel {
 
     /** Get the location of an widget */
     public String getLocation(Widget w) {
-        for (final Iterator<String> i = locationToWidget.keySet().iterator(); i
-                .hasNext();) {
-            final String location = i.next();
+        for (final String location : locationToWidget.keySet()) {
             if (locationToWidget.get(location) == w) {
                 return location;
             }
diff --git a/client/src/main/java/com/vaadin/client/ui/VNotification.java b/client/src/main/java/com/vaadin/client/ui/VNotification.java
index f5815e093b..e5358a3db7 100644
--- a/client/src/main/java/com/vaadin/client/ui/VNotification.java
+++ b/client/src/main/java/com/vaadin/client/ui/VNotification.java
@@ -466,17 +466,14 @@ public class VNotification extends VOverlay {
     }
 
     public void removeEventListener(EventListener listener) {
-        if (listeners == null) {
-            return;
+        if (listeners != null) {
+            listeners.remove(listener);
         }
-        listeners.remove(listener);
     }
 
     private void fireEvent(HideEvent event) {
         if (listeners != null) {
-            for (Iterator<EventListener> it = listeners.iterator(); it
-                    .hasNext();) {
-                EventListener l = it.next();
+            for (EventListener l : listeners) {
                 l.notificationHidden(event);
             }
         }
diff --git a/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
index 1bd721787c..5d49c6cbce 100644
--- a/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
@@ -96,9 +96,7 @@ public abstract class TabsheetBaseConnector
         }
 
         // Detach any old tab widget, should be max 1
-        for (Iterator<Widget> iterator = oldWidgets.iterator(); iterator
-                .hasNext();) {
-            Widget oldWidget = iterator.next();
+        for (Widget oldWidget : oldWidgets) {
             if (oldWidget.isAttached()) {
                 oldWidget.removeFromParent();
             }