From cb111e40d44c0266777f9cc5a8fdc13aef487940 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 30 Nov 2009 06:27:31 +0000
Subject: [PATCH] fixes #3783, event listener registered now in right place

svn changeset:10096/svn branch:6.2
---
 src/com/vaadin/terminal/gwt/client/ui/VPanel.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
index 8b054160a8..bec26ada7d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
@@ -78,13 +78,11 @@ public class VPanel extends SimplePanel implements Container {
 
     private ClickEventHandler clickEventHandler = new ClickEventHandler(this,
             CLICK_EVENT_IDENTIFIER) {
-
         @Override
         protected <H extends EventHandler> HandlerRegistration registerHandler(
                 H handler, Type<H> type) {
             return addDomHandler(handler, type);
         }
-
     };
 
     public VPanel() {
@@ -121,7 +119,6 @@ public class VPanel extends SimplePanel implements Container {
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         rendering = true;
         if (!uidl.hasAttribute("cached")) {
-            clickEventHandler.handleEventHandlerRegistration(client);
 
             // Handle caption displaying and style names, prior generics.
             // Affects size
@@ -170,6 +167,8 @@ public class VPanel extends SimplePanel implements Container {
             return;
         }
 
+        clickEventHandler.handleEventHandlerRegistration(client);
+
         this.client = client;
         id = uidl.getId();
 
-- 
2.39.5