Changeset 5231

Timestamp:

08/21/08 08:26:41 (3 months ago)

Author:

risto.yrjana@…

Message:

Simplified server API and added client support for description

Location:

incubator/widgets/popuppanel/src/com/itmill/toolkit/ui

Files:

• PopupPanel.java (modified) (11 diffs)
• gwt/client/ui/IPopupPanel.java (modified) (5 diffs)

incubator/widgets/popuppanel/src/com/itmill/toolkit/ui/PopupPanel.java

@@ -1 +1 @@
 package com.itmill.toolkit.ui;
 
+import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 
@@ -11 +10 @@
 public class PopupPanel extends AbstractComponentContainer {
 
-    java.lang.String smallView;
-    Component largeView;
-    Component currentPopupComponent;
     Content itsContent;
     boolean popupVisible;
-
-    // To make this behave more like a container
-    List componentList = new LinkedList();
-
-    /* **Constructors** */
-
-    /**
-     * A simple way to create a PopupPanel.
+    ArrayList componentList;
+
+    /* Constructors */
+
+    /**
+     * A simple way to create a PopupPanel. Note that the minimal representation
+     * may not be dynamically updated, to achieve this create your own Content
+     * object.
      * 
      * @param small
-     *                the minimal textual representation as HTML
+     *            the minimal textual representation as HTML
      * @param large
-     *                the full, Component-type representation
+     *            the full, Component-type representation
      */
     public PopupPanel(final java.lang.String small, final Component large) {
-        super();
-        PopupPanel.Content content = new PopupPanel.Content() {
+        this(new PopupPanel.Content() {
             public java.lang.String getMinimizedValueAsHTML() {
                 return small;
@@ -40 +35 @@
                 return large;
             }
-        };
-
-        itsContent = content;
-        popupVisible = false;
+        });
 
     }
@@ -52 +44 @@
      * 
      * @param content
-     *                the PopupPanel.Content that contains the information for
-     *                this
+     *            the PopupPanel.Content that contains the information for this
      */
     public PopupPanel(final PopupPanel.Content content) {
@@ -59 +50 @@
         itsContent = content;
         popupVisible = false;
-    }
-
-    /* These methods should be preferred */
+        componentList = new ArrayList(1);
+    }
 
     /**
@@ -68 +58 @@
      * 
      * @param newContent
-     *                PopupPanel.Content object containing new information for
-     *                the PopupPanel
+     *            PopupPanel.Content object containing new information for the
+     *            PopupPanel
      * 
      */
     public void setContent(PopupPanel.Content newContent) {
-        if (newContent != null) {
-            addComponent(newContent.getPopupComponent());
-            itsContent = newContent;
-
-        } else {
-            removeAllComponents();
-        }
-
+        itsContent = newContent;
         requestRepaint();
-    }
-
-    /**
-     * Returns the smaller, minimized representation of the data. Returns null
-     * if the object has no content.
-     * 
-     * @return minimal representation as HTML or null
-     */
-    public java.lang.String getSmallView() {
-        if (itsContent != null) {
-            return itsContent.getMinimizedValueAsHTML();
-        }
-        return null;
-    }
-
-    /**
-     * Returns the larger, full representation of the data. Returns null if the
-     * object has no internal content
-     * 
-     * @return full representation as a Component or null
-     */
-    public Component getLargeView() {
-        if (itsContent != null) {
-            if (currentPopupComponent == null) {
-                addComponent(itsContent.getPopupComponent());
-            }
-            return currentPopupComponent;
-        }
-        return null;
     }
 
@@ -134 +88 @@
     /*
      * Methods inherited from AbstractComponentContainer. These are unnecessary
-     * (but mandatory). Some of them are not supported in this implementation.
-     */
-
-    /**
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#attach()
-     */
-    public void attach() {
-        super.attach();
-        getLargeView().attach();
-    }
-
-    /**
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#detach()
-     */
-    public void detach() {
-        super.detach();
-        getLargeView().detach();
-    }
-
-    /**
-     * Returns an iterator for compatibility. The underlying List contains one
-     * element.
-     * 
-     * @return an iterator with one Component element that == getLargeView()
+     * (but mandatory). They are not supported in this implementation.
+     */
+
+    /**
+     * Not supported in this implementation. Will return an empty iterator.
+     * 
      * @see com.itmill.toolkit.ui.ComponentContainer#getComponentIterator()
      */
     public Iterator getComponentIterator() {
         return componentList.iterator();
-    }
-
-    /**
-     * Clears both aspects of the PopupPanel. This is also true if the object is
-     * a dynamic PopupPanel. The object is guaranteed to be empty after this
-     * call.
+
+    }
+
+    /**
+     * Not supported in this implementation.
      * 
      * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeAllComponents()
+     * @throws UnsupportedOperationException
      */
     public void removeAllComponents() {
-        if (currentPopupComponent != null) {
-            removeComponent(currentPopupComponent);
-        }
-
-        itsContent = null;
-        requestRepaint();
+        throw new UnsupportedOperationException();
     }
 
@@ -184 +115 @@
      * UnsupportedOperationException.
      * 
-     * 
-     * @param source
-     *                contains the (single) component that is used as the
-     *                popup-view
-     * @throws UnsupportedOperationException
      * @see com.itmill.toolkit.ui.AbstractComponentContainer#moveComponentsFrom(com.itmill.toolkit.ui.ComponentContainer)
+     * @throws UnsupportedOperationException
      */
     public void moveComponentsFrom(ComponentContainer source)
             throws UnsupportedOperationException {
 
-        throw new UnsupportedOperationException(
-                "moveComponentsFrom not supported");
-    }
-
-    /**
-     * This adds a new Component as the full representation and removes the old
-     * one. It's effectively a replacement method. Users should remember that
-     * the only supported way of changing the contents of this object is through
-     * the PopupPanel.Content interface.
-     * 
-     * 
-     * @param c
-     *                the component to be added
-     * @throws RuntimeException
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported in this implementation.
+     * 
      * @see com.itmill.toolkit.ui.AbstractComponentContainer#addComponent(com.itmill.toolkit.ui.Component)
-     */
-    public void addComponent(Component c) throws RuntimeException {
-        if (c != null) {
-            if (currentPopupComponent != null) {
-                removeComponent(currentPopupComponent);
-            }
-
-            if (c instanceof AbstractComponent)
-                ((AbstractComponent) c).setImmediate(true);
-
-            currentPopupComponent = c;
-
-            componentList.add(c);
-            super.addComponent(c);
-        }
+     * @throws UnsupportedOperationException
+     */
+    public void addComponent(Component c) throws UnsupportedOperationException {
+        throw new UnsupportedOperationException();
+
     }
 
@@ -230 +139 @@
      * UnsupportedOperationException.
      * 
-     * @param oldComponent
-     *                the existing component
-     * @param newComponent
-     *                the new component
-     * @throws UnsupportedOperationException
      * @see com.itmill.toolkit.ui.ComponentContainer#replaceComponent(com.itmill.toolkit.ui.Component,
      *      com.itmill.toolkit.ui.Component)
+     * @throws UnsupportedOperationException
      */
     public void replaceComponent(Component oldComponent, Component newComponent)
             throws UnsupportedOperationException {
 
-        throw new UnsupportedOperationException(
-                "Method replaceComponent not supported");
-    }
-
-    /**
-     * Remove the larger view. Users should remember that the only supported way
-     * of changing the contents of this object is through the PopupPanel.Content
-     * interface.
-     * 
-     * @param c
-     *                the component to be removed, in this case must be c ==
-     *                getLargeView()
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Not supported in this implementation
      * 
      * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeComponent(com.itmill.toolkit.ui.Component)
      */
-    public void removeComponent(Component c) throws RuntimeException {
-        if (currentPopupComponent != null) {
-            super.removeComponent(c);
-            componentList.remove(c);
-            currentPopupComponent = null;
-        }
+    public void removeComponent(Component c)
+            throws UnsupportedOperationException {
+        throw new UnsupportedOperationException();
+
     }
 
@@ -284 +180 @@
         super.paintContent(target);
 
-        target.addAttribute("html", getSmallView());
+        target.addAttribute("html", itsContent.getMinimizedValueAsHTML());
         target.addAttribute("popupVisible", popupVisible);
 
-        Component componentToShow = getLargeView();
-
         if (popupVisible) {
+            Component c = itsContent.getPopupComponent();
+
             target.startTag("popupComponent");
-            componentToShow.paint(target);
+            c.paint(target);
             target.endTag("popupComponent");
-        } else {
-            removeComponent(componentToShow);
         }
 
@@ -307 +201 @@
     public void changeVariables(Object source, Map variables) {
         if (variables.containsKey("popupVisibility")) {
-            Boolean tmp = (Boolean) variables.get("popupVisibility");
-            popupVisible = tmp.booleanValue();
+            popupVisible = ((Boolean) variables.get("popupVisibility"))
+                    .booleanValue();
+
+            if (popupVisible) {
+                componentList.add(itsContent.getPopupComponent());
+            } else {
+                componentList.clear();
+            }
             requestRepaint();
         }

incubator/widgets/popuppanel/src/com/itmill/toolkit/ui/gwt/client/ui/IPopupPanel.java

@@ -10 +10 @@
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HasFocus;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.PopupListener;
@@ -87 +88 @@
         hostPopupVisible = uidl.getBooleanAttribute("popupVisible");
         this.setHTML(uidl.getStringAttribute("html"));
+
+        if (uidl.hasAttribute("description")) {
+            this.setTitle(uidl.getStringAttribute("description"));
+        }
 
         // Render the popup if visible and show it. The component inside can
@@ -132 +137 @@
                 int left = hostHorizontalCenter - offsetWidth / 2;
                 int top = hostVerticalCenter - offsetHeight / 2;
+
                 popup.setPopupPosition(left, top);
 
@@ -163 +169 @@
 
     public static native void nativeBlur(Element e) /*-{ 
-                                       if(e.focus) {
-                                       e.focus();
-                                       e.blur();
-                                     }
-                                     }-*/;
+                                                         if(e.focus) {
+                                                         e.focus();
+                                                         e.blur();
+                                                       }
+                                                       }-*/;
 
     private class CustomPopup extends ToolkitOverlay implements Container {
@@ -216 +222 @@
         public void hide() {
             // Notify children with focus
+            if ((popupComponentWidget instanceof HasFocus)) {
+                ((HasFocus) popupComponentWidget).setFocus(false);
+            }
+
             for (Iterator iterator = activeChildren.iterator(); iterator
                     .hasNext();) {