You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/11/17 14:18:31 UTC
svn commit: r1770198 - in
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal:
component/ renderkit/renderer/ taglib/component/
Author: lofwyr
Date: Thu Nov 17 14:18:31 2016
New Revision: 1770198
URL: http://svn.apache.org/viewvc?rev=1770198&view=rev
Log:
TOBAGO-1592 Support custom width on tc:column (using auto-layout)
* <tc:style> can be used with <tc:column>
TOBAGO-1625: <tc:style> support for <tc:row> and <tc:column>
* prepare
[developed with hnoeth]
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumn.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumn.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumn.java?rev=1770198&r1=1770197&r2=1770198&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumn.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumn.java Thu Nov 17 14:18:31 2016
@@ -19,9 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.component.Visual;
-
-public abstract class AbstractUIColumn extends AbstractUIColumnBase implements Visual {
+public abstract class AbstractUIColumn extends AbstractUIColumnBase {
// public abstract Measure getWidth();
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java?rev=1770198&r1=1770197&r2=1770198&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java Thu Nov 17 14:18:31 2016
@@ -19,9 +19,11 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.Visual;
+
import javax.faces.component.UIColumn;
-public class AbstractUIColumnBase extends UIColumn {
+public abstract class AbstractUIColumnBase extends UIColumn implements Visual {
public boolean isResizable() {
return false;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java?rev=1770198&r1=1770197&r2=1770198&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java Thu Nov 17 14:18:31 2016
@@ -21,5 +21,5 @@ package org.apache.myfaces.tobago.intern
import javax.faces.component.behavior.ClientBehaviorHolder;
-public class AbstractUIRow extends AbstractUIColumnBase implements ClientBehaviorHolder {
+public abstract class AbstractUIRow extends AbstractUIColumnBase implements ClientBehaviorHolder {
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java?rev=1770198&r1=1770197&r2=1770198&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java Thu Nov 17 14:18:31 2016
@@ -42,6 +42,10 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.layout.Cell;
import org.apache.myfaces.tobago.internal.layout.Grid;
import org.apache.myfaces.tobago.internal.layout.OriginCell;
+import org.apache.myfaces.tobago.internal.renderkit.CommandMap;
+import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.internal.util.JsonUtils;
+import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.Display;
import org.apache.myfaces.tobago.layout.Measure;
@@ -59,15 +63,11 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.Arias;
-import org.apache.myfaces.tobago.internal.renderkit.CommandMap;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlButtonTypes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
-import org.apache.myfaces.tobago.internal.util.JsonUtils;
-import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
@@ -429,7 +429,8 @@ public class SheetRenderer extends Rende
markup = Markup.NULL;
}
markup = markup.add(getMarkupForAlign(normalColumn));
- writer.writeClassAttribute(Classes.create(sheet, "cell", markup));
+ writer.writeClassAttribute(Classes.create(sheet, "cell", markup), normalColumn.getCustomClass());
+ writer.writeStyleAttribute(normalColumn.getStyle());
if (normalColumn instanceof UIColumnSelector) {
UIColumnSelector selector = (UIColumnSelector) normalColumn;
@@ -763,6 +764,8 @@ public class SheetRenderer extends Rende
final Cell cell = grid.getCell(j - offset, i);
if (cell instanceof OriginCell) {
writer.startElement(HtmlElements.TH);
+ writer.writeClassAttribute(column.getCustomClass());
+ writer.writeStyleAttribute(column.getStyle());
if (cell.getColumnSpan() > 1) {
writer.writeAttribute(HtmlAttributes.COLSPAN, cell.getColumnSpan());
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java?rev=1770198&r1=1770197&r2=1770198&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java Thu Nov 17 14:18:31 2016
@@ -25,6 +25,7 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.component.ClientBehaviors;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
/**
* This component creates a representative in a UISheet for each row.
@@ -44,5 +45,5 @@ import org.apache.myfaces.tobago.interna
@Behavior(
name = ClientBehaviors.DBLCLICK)
})
-public interface RowTagDeclaration extends HasIdBindingAndRendered {
+public interface RowTagDeclaration extends HasIdBindingAndRendered, IsVisual {
}