Changeset 4805

Timestamp:

06/09/08 09:44:40 (6 months ago)

Author:

matti.tahvonen@…

Message:

new tooltips for iformlayout too

Files:

• trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java (modified) (8 diffs)

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java

@@ -16 +16 @@
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
 import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.ErrorMessage;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
@@ -103 +102 @@
         final ErrorFlag e = (ErrorFlag) componentToError.get(component);
         if (e != null) {
-            e.updateFromUIDL(uidl);
+            e.updateFromUIDL(uidl, component);
         }
     }
@@ -178 +177 @@
             if (uidl.hasAttribute("description")) {
                 if (captionText != null) {
-                    DOM.setElementProperty(captionText, "title", uidl
-                            .getStringAttribute("description"));
                     addStyleDependentName("hasdescription");
                 } else {
-                    setTitle(uidl.getStringAttribute("description"));
                     removeStyleDependentName("hasdescription");
                 }
@@ -226 +222 @@
             return owner;
         }
+
+        public void onBrowserEvent(Event event) {
+            super.onBrowserEvent(event);
+            if (client != null) {
+                client.handleTooltipEvent(event, owner);
+            }
+        }
     }
 
@@ -231 +234 @@
         private static final String CLASSNAME = ".i-form-layout-error-indicator";
         Element errorIndicatorElement;
-        private ErrorMessage errorMessage;
+        private Paintable owner;
 
         public ErrorFlag() {
@@ -237 +240 @@
         }
 
-        public void updateFromUIDL(UIDL uidl) {
+        public void updateFromUIDL(UIDL uidl, Paintable component) {
+            owner = component;
             if (uidl.hasAttribute("error")) {
-                final UIDL errorUidl = uidl.getErrors();
-
                 if (errorIndicatorElement == null) {
                     errorIndicatorElement = DOM.createDiv();
@@ -250 +252 @@
                     DOM.appendChild(getElement(), errorIndicatorElement);
                 }
-                if (errorMessage == null) {
-                    errorMessage = new ErrorMessage();
-                }
-                errorMessage.updateFromUIDL(errorUidl);
 
             } else if (errorIndicatorElement != null) {
@@ -262 +260 @@
 
         public void onBrowserEvent(Event event) {
-            final Element target = DOM.eventGetTarget(event);
-            if (errorIndicatorElement != null
-                    && DOM.compare(target, errorIndicatorElement)) {
-                switch (DOM.eventGetType(event)) {
-                case Event.ONMOUSEOVER:
-                    showErrorMessage();
-                    break;
-                case Event.ONMOUSEOUT:
-                    hideErrorMessage();
-                    break;
-                case Event.ONCLICK:
-                    ApplicationConnection.getConsole().log(
-                            DOM.getInnerHTML(errorMessage.getElement()));
-                default:
-                    break;
-                }
-            } else {
-                super.onBrowserEvent(event);
-            }
-        }
-
-        private void hideErrorMessage() {
-            if (errorMessage != null) {
-                errorMessage.hide();
-            }
-        }
-
-        private void showErrorMessage() {
-            if (errorMessage != null) {
-                errorMessage.showAt(errorIndicatorElement);
+            super.onBrowserEvent(event);
+            if (owner != null) {
+                client.handleTooltipEvent(event, owner);
             }
         }