[richfaces-svn-commits] JBoss Rich Faces SVN: r9205 - trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit.

[richfaces-svn-commits at lists.jboss.org]

Author: pkawiak
Date: 2008-06-25 03:38:17 -0400 (Wed, 25 Jun 2008)
New Revision: 9205

Modified:
   trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
Log:
fixed a bug with minimal column width


Modified: trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java	2008-06-24 23:05:33 UTC (rev 9204)
+++ trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java	2008-06-25 07:38:17 UTC (rev 9205)
@@ -122,7 +122,13 @@
             UIColumn col = cols.next();
             if (col.isRendered()) {
                 writer.startElement("col", table);
-                writer.writeAttribute("width", table.getColumnSize(col), null);
+=
+                String colWidth = table.getColumnSize(col);
+                if (Integer.valueOf(colWidth) < Integer
+                        .valueOf(MIN_COLUMN_WIDTH)) {
+                    colWidth = MIN_COLUMN_WIDTH;
+                }
+                writer.writeAttribute("width", colWidth, null);
                 writer.endElement("col");
             }
         }
@@ -330,9 +336,9 @@
                 if (null != component.getFacet(facetName)) {
                     result = true;
                 } /*
-                     * else if(component instanceof Column) { Column column =
-                     * (Column)component; result = column.isSelfSorted(); }
-                     */
+                 * else if(component instanceof Column) { Column column =
+                 * (Column)component; result = column.isSelfSorted(); }
+                 */
             }
         }
         return result;
@@ -1106,11 +1112,11 @@
                                 table.setGroupingColumn(column);
                             }
                         } else if (isSingleSortMode) { // in case of single
-                                                        // sort mode
+                            // sort mode
                             if (!isGroupingColumn) { // grouping is not by
-                                                        // this column
+                                // this column
                                 if (!sortByGroupingColumn) {// sort not by
-                                                            // grouping column
+                                    // grouping column
                                     // disable sort by this column
                                     column.setSortOrder(Ordering.UNSORTED);
                                 }
@@ -1162,9 +1168,9 @@
                         UIColumn column = columns.next();
                         // child.setId(child.getId());
                         if (groupColumnId.equals(column.getClientId(context))) { // group
-                                                                                    // by
-                                                                                    // this
-                                                                                    // column
+                            // by
+                            // this
+                            // column
                             // set sort order if is not set
                             if (column.getSortOrder().equals(Ordering.UNSORTED)) {
                                 column.setSortOrder(Ordering.ASCENDING);
@@ -1448,7 +1454,7 @@
             if (column instanceof UIColumn) {
                 UIColumn dataColumn = (UIColumn) column;
                 String clientId = dataColumn.getClientId(context);// +
-                                                                    // facetName;
+                // facetName;
                 writer.writeAttribute("id", clientId, null);
                 column.getAttributes().put("columnClientId", clientId);
                 boolean sortable = sortableColumn && dataColumn.isSelfSorted();