From bb3f18f728be606c4fca6c5f94ad1c89c147ef53 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 15 Aug 2007 05:22:56 +0000
Subject: [PATCH] description using title attribute

svn changeset:2011/svn branch:trunk
---
 .../toolkit/terminal/gwt/client/Caption.java       | 14 +++++++++++---
 .../terminal/gwt/client/CaptionWrapper.java        |  9 +++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java
index b3ba8edc9d..3e1936638b 100644
--- 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 dd07399854..b0640fb90f 100644
--- 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"));
 	}
 	
-- 
2.39.5