4 files changed, 37 insertions, 16 deletions
diff --git a/src/com/vaadin/terminal/AbstractClientConnector.java b/src/com/vaadin/terminal/AbstractClientConnector.java
index ad7c98b7e1..136ed702fc 100644
--- a/src/com/vaadin/terminal/AbstractClientConnector.java
+++ b/src/com/vaadin/terminal/AbstractClientConnector.java
@@ -1,3 +1,6 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
 package com.vaadin.terminal;
 
 import java.io.Serializable;
@@ -197,6 +200,27 @@ public abstract class AbstractClientConnector implements ClientConnector {
         }
     }
 
+    private static final class AllChildrenIterable implements
+            Iterable<ClientConnector>, Serializable {
+        private final ClientConnector connector;
+
+        private AllChildrenIterable(ClientConnector connector) {
+            this.connector = connector;
+        }
+
+        public Iterator<ClientConnector> iterator() {
+            CombinedIterator<ClientConnector> iterator = new CombinedIterator<ClientConnector>();
+            iterator.addIterator(connector.getExtensionIterator());
+
+            if (connector instanceof HasComponents) {
+                HasComponents hasComponents = (HasComponents) connector;
+                iterator.addIterator(hasComponents.iterator());
+            }
+
+            return iterator;
+        }
+    }
+
     private class RpcInvoicationHandler implements InvocationHandler,
             Serializable {
 
@@ -349,19 +373,7 @@ public abstract class AbstractClientConnector implements ClientConnector {
 
     public static Iterable<ClientConnector> getAllChildrenIteratable(
             final ClientConnector connector) {
-        return new Iterable<ClientConnector>() {
-            public Iterator<ClientConnector> iterator() {
-                CombinedIterator<ClientConnector> iterator = new CombinedIterator<ClientConnector>();
-                iterator.addIterator(connector.getExtensionIterator());
-
-                if (connector instanceof HasComponents) {
-                    HasComponents hasComponents = (HasComponents) connector;
-                    iterator.addIterator(hasComponents.iterator());
-                }
-
-                return iterator;
-            }
-        };
+        return new AllChildrenIterable(connector);
     }
 
     public Iterator<Extension> getExtensionIterator() {
diff --git a/src/com/vaadin/terminal/AbstractExtension.java b/src/com/vaadin/terminal/AbstractExtension.java
index d01f7544c5..35123bc488 100644
--- a/src/com/vaadin/terminal/AbstractExtension.java
+++ b/src/com/vaadin/terminal/AbstractExtension.java
@@ -1,9 +1,13 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+
 package com.vaadin.terminal;
 
 import com.vaadin.terminal.gwt.server.ClientConnector;
 
-public abstract class AbstractExtension extends AbstractClientConnector implements
-        Extension {
+public abstract class AbstractExtension extends AbstractClientConnector
+        implements Extension {
 
     protected Class<? extends ClientConnector> getAcceptedParentType() {
         return ClientConnector.class;
diff --git a/src/com/vaadin/terminal/Extension.java b/src/com/vaadin/terminal/Extension.java
index 7e4b92811d..7769423f0d 100644
--- a/src/com/vaadin/terminal/Extension.java
+++ b/src/com/vaadin/terminal/Extension.java
@@ -1,3 +1,7 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+
 package com.vaadin.terminal;
 
 import com.vaadin.terminal.gwt.server.ClientConnector;
diff --git a/src/com/vaadin/ui/DirtyConnectorTracker.java b/src/com/vaadin/ui/DirtyConnectorTracker.java
index a4e509422c..dae334fe4c 100644
--- a/src/com/vaadin/ui/DirtyConnectorTracker.java
+++ b/src/com/vaadin/ui/DirtyConnectorTracker.java
@@ -3,6 +3,7 @@
  */
 package com.vaadin.ui;
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -23,7 +24,7 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * @since 7.0.0
  * 
  */
-public class DirtyConnectorTracker {
+public class DirtyConnectorTracker implements Serializable {
     private Set<ClientConnector> dirtyConnectors = new HashSet<ClientConnector>();
     private Root root;