Changeset 5142

Timestamp:

08/06/08 07:26:52 (5 months ago)

Author:

matti.tahvonen@…

Message:

fixes #1965 (support for table column icons)

Files:

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

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

@@ -1270 +1270 @@
                 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) {
@@ -1281 +1283 @@
                     }
                 } else {
-                    c.setText(col.getStringAttribute("caption"));
+                    c.setText(caption);
                 }
 
@@ -1299 +1301 @@
                     c.setWidth(Integer.parseInt(width));
                 }
-                // TODO icon
             }
             // check for orphaned header cells
@@ -1960 +1961 @@
                 // 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++], "");
                 }
 
@@ -2250 +2244 @@
     }
 
+    /**
+     * 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;
+    }
+
 }