3 files changed, 10 insertions, 8 deletions
diff --git a/shared/src/com/vaadin/shared/ComponentState.java b/shared/src/com/vaadin/shared/ComponentState.java
index 2ecf09b422..d8b5fec587 100644
--- a/shared/src/com/vaadin/shared/ComponentState.java
+++ b/shared/src/com/vaadin/shared/ComponentState.java
@@ -17,7 +17,6 @@
 package com.vaadin.shared;
 
 import java.util.List;
-import java.util.Set;
 
 import com.vaadin.shared.communication.SharedState;
 
@@ -40,10 +39,6 @@ public class ComponentState extends SharedState {
     public List<String> styles = null;
     public String id = null;
     public String primaryStyleName = null;
-    /**
-     * A set of event identifiers with registered listeners.
-     */
-    public Set<String> registeredEventListeners = null;
 
     // HTML formatted error message for the component
     // TODO this could be an object with more information, but currently the UI
diff --git a/shared/src/com/vaadin/shared/communication/SharedState.java b/shared/src/com/vaadin/shared/communication/SharedState.java
index 4473eba7a0..45cfd8644a 100644
--- a/shared/src/com/vaadin/shared/communication/SharedState.java
+++ b/shared/src/com/vaadin/shared/communication/SharedState.java
@@ -19,6 +19,7 @@ package com.vaadin.shared.communication;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import com.vaadin.shared.Connector;
 
@@ -60,4 +61,9 @@ public class SharedState implements Serializable {
     public Map<String, URLReference> resources = new HashMap<String, URLReference>();
 
     public boolean enabled = true;
+    /**
+     * A set of event identifiers with registered listeners.
+     */
+    public Set<String> registeredEventListeners = null;
+
 }
diff --git a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java b/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java
index 5e6700b425..33f841fa09 100644
--- a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java
+++ b/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java
@@ -3,6 +3,7 @@ package com.vaadin.shared.ui;
 import java.util.HashSet;
 
 import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.communication.SharedState;
 
 public final class ComponentStateUtil {
 
@@ -40,8 +41,8 @@ public final class ComponentStateUtil {
      * @param eventListenerId
      *            The event identifier to remove
      */
-    public static final void removeRegisteredEventListener(
-            ComponentState state, String eventIdentifier) {
+    public static final void removeRegisteredEventListener(SharedState state,
+            String eventIdentifier) {
         if (state.registeredEventListeners == null) {
             return;
         }
@@ -57,7 +58,7 @@ public final class ComponentStateUtil {
      * @param eventListenerId
      *            The event identifier to add
      */
-    public static final void addRegisteredEventListener(ComponentState state,
+    public static final void addRegisteredEventListener(SharedState state,
             String eventListenerId) {
         if (state.registeredEventListeners == null) {
             state.registeredEventListeners = new HashSet<String>();