fixes #1965 (support for table column icons)

svn changeset:5142/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index cfb24cfbeca8d033a532e7b2c1c12565ec83ec5f..af1623c71d23b17ca0e684d2d98cc7ee4d674693 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -1269,9 +1269,11 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
                 final UIDL col = (UIDL) it.next();
                 final String cid = col.getStringAttribute("cid");
                 updated.add(cid);
+
+                String caption = buildCaptionHtmlSnippet(col);
                 HeaderCell c = getHeaderCell(cid);
                 if (c == null) {
-                    c = new HeaderCell(cid, col.getStringAttribute("caption"));
+                    c = new HeaderCell(cid, caption);
                     availableCells.put(cid, c);
                     if (initializedAndAttached) {
                         // we will need a column width recalculation
@@ -1280,7 +1282,7 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
                         isNewBody = true;
                     }
                 } else {
-                    c.setText(col.getStringAttribute("caption"));
+                    c.setText(caption);
                 }
 
                 if (col.hasAttribute("sortable")) {
@@ -1298,7 +1300,6 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
                     final String width = col.getStringAttribute("width");
                     c.setWidth(Integer.parseInt(width));
                 }
-                // TODO icon
             }
             // check for orphaned header cells
             it = availableCells.keySet().iterator();
@@ -1959,14 +1960,7 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
                 int col = 0;
                 // row header
                 if (showRowHeaders) {
-                    String caption = uidl.getStringAttribute("caption");
-                    if (uidl.hasAttribute("icon")) {
-                        caption = "<img src=\""
-                                + client.translateToolkitUri(uidl
-                                        .getStringAttribute("icon"))
-                                + "\" alt=\"icon\" class=\"i-icon\">" + caption;
-                    }
-                    addCell(caption, aligns[col++], "");
+                    addCell(buildCaptionHtmlSnippet(uidl), aligns[col++], "");
                 }
 
                 if (uidl.hasAttribute("al")) {
@@ -2249,4 +2243,22 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
         }
     }
 
+    /**
+     * Helper function to build html snippet for column or row headers
+     * 
+     * @param uidl
+     *                possibly with values caption and icon
+     * @return html snippet containing possibly an icon + caption text
+     */
+    private String buildCaptionHtmlSnippet(UIDL uidl) {
+        String s = uidl.getStringAttribute("caption");
+        if (uidl.hasAttribute("icon")) {
+            s = "<img src=\""
+                    + client.translateToolkitUri(uidl
+                            .getStringAttribute("icon"))
+                    + "\" alt=\"icon\" class=\"i-icon\">" + s;
+        }
+        return s;
+    }
+
 }