myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1746603 - in /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit: css/TobagoClass.java html/standard/standard/tag/SheetRenderer.java
Date Thu, 02 Jun 2016 16:25:19 GMT
Author: lofwyr
Date: Thu Jun  2 16:25:19 2016
New Revision: 1746603

URL: http://svn.apache.org/viewvc?rev=1746603&view=rev
Log:
TOBAGO-1502: Advanced tc:sheet support for Bootstrap
* text-align for the header dependent of the <tc:cloumn> align attribute

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java?rev=1746603&r1=1746602&r2=1746603&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
Thu Jun  2 16:25:19 2016
@@ -53,6 +53,9 @@ public enum TobagoClass implements CssIt
   SECTION__HEADER("tobago-section-header"),
   SHEET__PAGING_INPUT("tobago-sheet-pagingInput"),
   SHEET__PAGING_OUTPUT("tobago-sheet-pagingOutput"),
+  SHEET__CELL__MARKUP__RIGHT("tobago-sheet-cell-markup-right"),
+  SHEET__CELL__MARKUP__CENTER("tobago-sheet-cell-markup-center"),
+  SHEET__CELL__MARKUP__JUSTIFY("tobago-sheet-cell-markup-justify"),
   SUGGEST("tobago-suggest");
 
   private static final Logger LOG = LoggerFactory.getLogger(TobagoClass.class);

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1746603&r1=1746602&r2=1746603&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
Thu Jun  2 16:25:19 2016
@@ -391,22 +391,7 @@ public class SheetRenderer extends Rende
           if (isPure(column)) {
             markup = markup.add(Markup.PURE);
           }
-          final String textAlign = ComponentUtils.getStringAttribute(column, Attributes.align);
-          if (textAlign != null) {
-            switch (TextAlign.valueOf(textAlign)) {
-              case right:
-                markup = markup.add(Markup.RIGHT);
-                break;
-              case center:
-                markup = markup.add(Markup.CENTER);
-                break;
-              case justify:
-                markup = markup.add(Markup.JUSTIFY);
-                break;
-              default:
-                // nothing to do
-            }
-          }
+          markup = markup.add(getMarkupForAlign(column));
           writer.writeClassAttribute(Classes.create(sheet, "cell", markup));
 
           if (column instanceof UIColumnSelector) {
@@ -675,6 +660,23 @@ public class SheetRenderer extends Rende
     writer.endElement(HtmlElements.DIV);
   }
 
+  private Markup getMarkupForAlign(UIColumn column) {
+    final String textAlign = ComponentUtils.getStringAttribute(column, Attributes.align);
+    if (textAlign != null) {
+      switch (TextAlign.valueOf(textAlign)) {
+        case right:
+          return Markup.RIGHT;
+        case center:
+          return Markup.CENTER;
+        case justify:
+          return Markup.JUSTIFY;
+        default:
+          // nothing to do
+      }
+    }
+    return null;
+  }
+
   private void encodeHeaderRows(
       final FacesContext facesContext, final UISheet sheet, final TobagoResponseWriter writer,
       final List<AbstractUIColumnBase> columns)
@@ -687,9 +689,13 @@ public class SheetRenderer extends Rende
 
     for (int i = 0; i < grid.getRowCount(); i++) {
       writer.startElement(HtmlElements.TR);
-      for (int j = 0; j < grid.getColumnCount(); j++) {
-        final Cell cell = grid.getCell(j, i);
-        if (cell instanceof OriginCell) {
+      for (int j = 0; j < columns.size(); j++) {
+        final AbstractUIColumnBase column = columns.get(j);
+        if (column instanceof AbstractUIColumnEvent) {
+          offset++;
+        } else {
+         final Cell cell = grid.getCell(j - offset , i);
+         if (cell instanceof OriginCell) {
           writer.startElement(HtmlElements.TH);
           if (cell.getColumnSpan() > 1) {
             writer.writeAttribute(HtmlAttributes.COLSPAN, cell.getColumnSpan());
@@ -702,9 +708,27 @@ public class SheetRenderer extends Rende
           final boolean pure = !(cellComponent instanceof UIOut);
 
           writer.startElement(HtmlElements.DIV);
-          writer.writeClassAttribute(Classes.create(sheet, "headerCell"));
+          final CssItem align;
+          final String alignString = ComponentUtils.getStringAttribute(column, Attributes.align);
+          if (alignString != null) {
+            switch (TextAlign.valueOf(alignString)) {
+              case right:
+                align = TobagoClass.SHEET__CELL__MARKUP__RIGHT;
+                break;
+              case center:
+                align = TobagoClass.SHEET__CELL__MARKUP__CENTER;
+                break;
+              case justify:
+                align = TobagoClass.SHEET__CELL__MARKUP__JUSTIFY;
+                break;
+              default:
+                align = null;
+            }
+          } else {
+            align = null;
+          }
+          writer.writeClassAttribute(Classes.create(sheet, "headerCell"), align);
           writer.startElement(HtmlElements.SPAN);
-          final AbstractUIColumnBase column = columns.get(j + offset);
           Icons sorterIcon = null;
           Markup markup = Markup.NULL;
           String tip = ComponentUtils.getStringAttribute(column, Attributes.tip);
@@ -833,13 +857,14 @@ public class SheetRenderer extends Rende
           writer.endElement(HtmlElements.SPAN);
           if (!autoLayout) {
             if (column.isResizable()) {
-              encodeResizing(writer, sheet, j + offset + cell.getColumnSpan() - 1);
+              encodeResizing(writer, sheet, j + cell.getColumnSpan() - 1);
             }
           }
           writer.endElement(HtmlElements.DIV);
 
           writer.endElement(HtmlElements.TH);
         }
+        }
       }
       if (!autoLayout) {
         // add a filler column



Mime
View raw message