Split AbsoluteLayout into widget + paintable

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
index e5982b1078f1ee102107eaa7120d59cc8452c668..7a659223141b1b36f16f8518c7d00431006a5e0b 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
@@ -4,7 +4,6 @@
 package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -13,17 +12,12 @@ import java.util.Set;
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style;
-import com.google.gwt.event.dom.client.DomEvent.Type;
-import com.google.gwt.event.shared.EventHandler;
-import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Container;
-import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.RenderSpace;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
@@ -31,7 +25,7 @@ import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.VPaintableMap;
 import com.vaadin.terminal.gwt.client.VPaintableWidget;
 
-public class VAbsoluteLayout extends ComplexPanel implements Container {
+public class VAbsoluteLayout extends ComplexPanel {
 
     /** Tag name for widget creation */
     public static final String TAGNAME = "absolutelayout";
@@ -49,26 +43,11 @@ public class VAbsoluteLayout extends ComplexPanel implements Container {
 
     private Object previousStyleName;
 
-    private Map<String, AbsoluteWrapper> pidToComponentWrappper = new HashMap<String, AbsoluteWrapper>();
+    Map<String, AbsoluteWrapper> pidToComponentWrappper = new HashMap<String, AbsoluteWrapper>();
 
     protected ApplicationConnection client;
 
-    private boolean rendering;
-
-    private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
-            this, EventId.LAYOUT_CLICK) {
-
-        @Override
-        protected VPaintableWidget getChildComponent(Element element) {
-            return getComponent(element);
-        }
-
-        @Override
-        protected <H extends EventHandler> HandlerRegistration registerHandler(
-                H handler, Type<H> type) {
-            return addDomHandler(handler, type);
-        }
-    };
+    boolean rendering;
 
     public VAbsoluteLayout() {
         setElement(Document.get().createDivElement());
@@ -143,40 +122,7 @@ public class VAbsoluteLayout extends ComplexPanel implements Container {
         parent2.updateCaption(uidl);
     }
 
-    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        rendering = true;
-        this.client = client;
-        // TODO margin handling
-        if (client.updateComponent(this, uidl, true)) {
-            rendering = false;
-            return;
-        }
-
-        clickEventHandler.handleEventHandlerRegistration(client);
-
-        HashSet<String> unrenderedPids = new HashSet<String>(
-                pidToComponentWrappper.keySet());
-
-        for (Iterator<Object> childIterator = uidl.getChildIterator(); childIterator
-                .hasNext();) {
-            UIDL cc = (UIDL) childIterator.next();
-            if (cc.getTag().equals("cc")) {
-                UIDL componentUIDL = cc.getChildUIDL(0);
-                unrenderedPids.remove(componentUIDL.getId());
-                getWrapper(client, componentUIDL).updateFromUIDL(cc);
-            }
-        }
-
-        for (String pid : unrenderedPids) {
-            AbsoluteWrapper absoluteWrapper = pidToComponentWrappper.get(pid);
-            pidToComponentWrappper.remove(pid);
-            absoluteWrapper.destroy();
-        }
-        rendering = false;
-    }
-
-    private AbsoluteWrapper getWrapper(ApplicationConnection client,
-            UIDL componentUIDL) {
+    AbsoluteWrapper getWrapper(ApplicationConnection client, UIDL componentUIDL) {
         AbsoluteWrapper wrapper = pidToComponentWrappper.get(componentUIDL
                 .getId());
         if (wrapper == null) {
@@ -364,7 +310,7 @@ public class VAbsoluteLayout extends ComplexPanel implements Container {
      * @return The Paintable which the element is a part of. Null if the element
      *         belongs to the layout and not to a child.
      */
-    private VPaintableWidget getComponent(Element element) {
+    VPaintableWidget getComponent(Element element) {
         return Util.getPaintableForElement(client, this, element);
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayoutPaintable.java
new file mode 100644 (file)
index 0000000..b054e57
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayoutPaintable.java
@@ -0,0 +1,78 @@
+package com.vaadin.terminal.gwt.client.ui;\r
+\r
+import java.util.HashSet;\r
+import java.util.Iterator;\r
+\r
+import com.google.gwt.core.client.GWT;\r
+import com.google.gwt.event.dom.client.DomEvent.Type;\r
+import com.google.gwt.event.shared.EventHandler;\r
+import com.google.gwt.event.shared.HandlerRegistration;\r
+import com.google.gwt.user.client.Element;\r
+import com.google.gwt.user.client.ui.Widget;\r
+import com.vaadin.terminal.gwt.client.ApplicationConnection;\r
+import com.vaadin.terminal.gwt.client.EventId;\r
+import com.vaadin.terminal.gwt.client.UIDL;\r
+import com.vaadin.terminal.gwt.client.VPaintableWidget;\r
+import com.vaadin.terminal.gwt.client.ui.VAbsoluteLayout.AbsoluteWrapper;\r
+\r
+public class VAbsoluteLayoutPaintable extends VAbstractPaintableWidget {\r
+\r
+    private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(\r
+            this, EventId.LAYOUT_CLICK) {\r
+\r
+        @Override\r
+        protected VPaintableWidget getChildComponent(Element element) {\r
+            return getWidgetForPaintable().getComponent(element);\r
+        }\r
+\r
+        @Override\r
+        protected <H extends EventHandler> HandlerRegistration registerHandler(\r
+                H handler, Type<H> type) {\r
+            return getWidgetForPaintable().addDomHandler(handler, type);\r
+        }\r
+    };\r
+\r
+    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {\r
+        getWidgetForPaintable().rendering = true;\r
+        getWidgetForPaintable().client = client;\r
+        // TODO margin handling\r
+        if (client.updateComponent(this, uidl, true)) {\r
+            getWidgetForPaintable().rendering = false;\r
+            return;\r
+        }\r
+\r
+        clickEventHandler.handleEventHandlerRegistration(client);\r
+\r
+        HashSet<String> unrenderedPids = new HashSet<String>(\r
+                getWidgetForPaintable().pidToComponentWrappper.keySet());\r
+\r
+        for (Iterator<Object> childIterator = uidl.getChildIterator(); childIterator\r
+                .hasNext();) {\r
+            UIDL cc = (UIDL) childIterator.next();\r
+            if (cc.getTag().equals("cc")) {\r
+                UIDL componentUIDL = cc.getChildUIDL(0);\r
+                unrenderedPids.remove(componentUIDL.getId());\r
+                getWidgetForPaintable().getWrapper(client, componentUIDL)\r
+                        .updateFromUIDL(cc);\r
+            }\r
+        }\r
+\r
+        for (String pid : unrenderedPids) {\r
+            AbsoluteWrapper absoluteWrapper = getWidgetForPaintable().pidToComponentWrappper\r
+                    .get(pid);\r
+            getWidgetForPaintable().pidToComponentWrappper.remove(pid);\r
+            absoluteWrapper.destroy();\r
+        }\r
+        getWidgetForPaintable().rendering = false;\r
+    }\r
+\r
+    @Override\r
+    protected Widget createWidget() {\r
+        return GWT.create(VAbsoluteLayout.class);\r
+    }\r
+\r
+    @Override\r
+    public VAbsoluteLayout getWidgetForPaintable() {\r
+        return (VAbsoluteLayout) super.getWidgetForPaintable();\r
+    }\r
+}\r

diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java
index d6f98976640b5de1a5dcc9cb149364cfd4237bf8..c75073c02bf647f6ab73eb2cb5768e61e4b34045 100644 (file)
--- a/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/src/com/vaadin/ui/AbsoluteLayout.java
@@ -17,7 +17,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.EventId;
-import com.vaadin.terminal.gwt.client.ui.VAbsoluteLayout;
+import com.vaadin.terminal.gwt.client.ui.VAbsoluteLayoutPaintable;
 
 /**
  * AbsoluteLayout is a layout implementation that mimics html absolute
@@ -25,7 +25,7 @@ import com.vaadin.terminal.gwt.client.ui.VAbsoluteLayout;
  * 
  */
 @SuppressWarnings("serial")
-@ClientWidget(VAbsoluteLayout.class)
+@ClientWidget(VAbsoluteLayoutPaintable.class)
 public class AbsoluteLayout extends AbstractLayout implements
         LayoutClickNotifier {