description using title attribute

svn changeset:2011/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java
index b3ba8edc9d85d660d8e90d5765bf47be13db48ac..3e1936638b098a9f3217c9526c34e1e1a493d620 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java
@@ -15,13 +15,21 @@ public class Caption extends HTML {
        }
        
        public void updateCaption(UIDL uidl) {
+               setVisible(!uidl.getBooleanAttribute("invisible"));
+               
                String c = uidl.getStringAttribute("caption");
-               // TODO Description and error messages
                if (c == null) {
                } else {
                        setText(c);
-               }               
-               setVisible(!uidl.getBooleanAttribute("invisible"));
+               }
+               
+               if(uidl.hasAttribute("description")) {
+                       setTitle(uidl.getStringAttribute("description"));
+               }
+               
+               if(uidl.hasAttribute("error")) {
+                       // TODO error messages
+               }
        }
        
        public static boolean isNeeded(UIDL uidl) {

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/CaptionWrapper.java b/src/com/itmill/toolkit/terminal/gwt/client/CaptionWrapper.java
index dd073998541d81456a51cf146c5a1f98c1381d5c..b0640fb90f99c8a394139777463386fce56a84f9 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/CaptionWrapper.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/CaptionWrapper.java
@@ -6,21 +6,18 @@ import com.google.gwt.user.client.ui.Widget;
 
 public class CaptionWrapper extends FlowPanel {
 
-       Label caption = new Label();
+       Caption caption;
        Paintable widget; 
        
        public CaptionWrapper(Paintable toBeWrapped) {
+               caption = new Caption(toBeWrapped);
                add(caption);
                widget = toBeWrapped;
                add((Widget) widget);
        }
        
        public void updateCaption(UIDL uidl) {
-               String c = uidl.getStringAttribute("caption");
-               // TODO Description and error messages
-               if (c != null) {
-                       caption.setText(c);
-               }
+               caption.updateCaption(uidl);
                setVisible(!uidl.getBooleanAttribute("invisible"));
        }