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/12/07 20:41:25 UTC
svn commit: r1773140 - in /myfaces/tobago/trunk: src/site/apt/
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/com...
Author: lofwyr
Date: Wed Dec 7 20:41:25 2016
New Revision: 1773140
URL: http://svn.apache.org/viewvc?rev=1773140&view=rev
Log:
TOBAGO-1659: Put column span and row span in a <tc:span> tag to use with grid layout
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SpanHandler.java
- copied, changed from r1772448, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java
- copied, changed from r1772448, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
Modified:
myfaces/tobago/trunk/src/site/apt/migration-3.0.apt
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/error.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/partial.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/70-grid-layout/grid-layout.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/type-of-literals.xhtml
Modified: myfaces/tobago/trunk/src/site/apt/migration-3.0.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/migration-3.0.apt?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/migration-3.0.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/migration-3.0.apt Wed Dec 7 20:41:25 2016
@@ -124,7 +124,9 @@ Migration from Tobago 2.0 to 3.0 (work i
* ClientProperties.pageHeight
- * <<<\<tc:gridLayoutConstraint\>>>> -> <<<\<tc:style\>>>>
+ * <<<\<tc:gridLayoutConstraint\>>>> -> <<<\<tc:span\>>>> (only for attributes columnSpan and rowSpan)
+
+ * <<<\<tc:gridLayoutConstraint\>>>> -> <<<\<tc:style\>>>> (all other attributes)
* <<<\<tc:toolBar\>>>> -> <<<\<tc:buttons\>>>>
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java Wed Dec 7 20:41:25 2016
@@ -57,7 +57,7 @@ public enum Attributes {
clientProperties,
collapsed,
collapsedMode,
- columnSpan,
+ column,
columnSpacing,
columns,
converter,
@@ -190,7 +190,7 @@ public enum Attributes {
required,
resizable,
rowId,
- rowSpan,
+ row,
rowSpacing,
rows,
scriptFiles,
@@ -330,7 +330,7 @@ public enum Attributes {
public static final String CLIENT_PROPERTIES = "clientProperties";
/** @deprecated Since Tobago 3.0.0. Please use the enum */
@Deprecated
- public static final String COLUMN_SPAN = "columnSpan";
+ public static final String COLUMN_SPAN = "column";
/** @deprecated Since Tobago 3.0.0. Please use the enum */
@Deprecated
public static final String COLUMN_SPACING = "columnSpacing";
@@ -633,7 +633,7 @@ public enum Attributes {
public static final String ROW_ID = "rowId";
/** @deprecated Since Tobago 3.0.0. Please use the enum */
@Deprecated
- public static final String ROW_SPAN = "rowSpan";
+ public static final String ROW_SPAN = "row";
/** @deprecated Since Tobago 3.0.0. Please use the enum */
@Deprecated
public static final String ROW_SPACING = "rowSpacing";
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SpanHandler.java (from r1772448, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SpanHandler.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SpanHandler.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java&r1=1772448&r2=1773140&rev=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SpanHandler.java Wed Dec 7 20:41:25 2016
@@ -30,39 +30,38 @@ import java.io.IOException;
import java.util.Map;
/**
- * @deprecated since 3.0.0
+ * @since 3.0.0
*/
-@Deprecated
-public class GridLayoutConstraintHandler extends TagHandler {
+public class SpanHandler extends TagHandler {
- private final TagAttribute columnSpan;
- private final TagAttribute rowSpan;
+ private final TagAttribute column;
+ private final TagAttribute row;
- public GridLayoutConstraintHandler(final TagConfig config) {
+ public SpanHandler(final TagConfig config) {
super(config);
- columnSpan = getAttribute(Attributes.columnSpan.getName());
- rowSpan = getAttribute(Attributes.rowSpan.getName());
+ column = getAttribute(Attributes.column.getName());
+ row = getAttribute(Attributes.row.getName());
}
@Override
public void apply(final FaceletContext faceletContext, UIComponent parent) throws IOException {
final Map<String, Object> attributes = parent.getAttributes();
- if (columnSpan != null) {
- if (columnSpan.isLiteral()) {
- attributes.put(Attributes.columnSpan.getName(), Integer.valueOf(columnSpan.getValue()));
+ if (column != null) {
+ if (column.isLiteral()) {
+ attributes.put(Attributes.column.getName(), Integer.valueOf(column.getValue()));
} else {
- parent.setValueExpression(Attributes.columnSpan.getName(),
- columnSpan.getValueExpression(faceletContext, Integer.TYPE));
+ parent.setValueExpression(Attributes.column.getName(),
+ column.getValueExpression(faceletContext, Integer.TYPE));
}
}
- if (rowSpan != null) {
- if (rowSpan.isLiteral()) {
- attributes.put(Attributes.rowSpan.getName(), Integer.valueOf(rowSpan.getValue()));
+ if (row != null) {
+ if (row.isLiteral()) {
+ attributes.put(Attributes.row.getName(), Integer.valueOf(row.getValue()));
} else {
- parent.setValueExpression(Attributes.rowSpan.getName(),
- rowSpan.getValueExpression(faceletContext, Integer.TYPE));
+ parent.setValueExpression(Attributes.row.getName(),
+ row.getValueExpression(faceletContext, Integer.TYPE));
}
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Wed Dec 7 20:41:25 2016
@@ -67,8 +67,8 @@ public abstract class AbstractUIGridLayo
final List<UIComponent> components = LayoutUtils.findLayoutChildren(this);
for (final UIComponent component : components) {
- final int columnSpan = ComponentUtils.getIntAttribute(component, Attributes.columnSpan, 1);
- final int rowSpan = ComponentUtils.getIntAttribute(component, Attributes.rowSpan, 1);
+ final int columnSpan = ComponentUtils.getIntAttribute(component, Attributes.column, 1);
+ final int rowSpan = ComponentUtils.getIntAttribute(component, Attributes.row, 1);
grid.add(new OriginCell(component), columnSpan, rowSpan);
if (LOG.isDebugEnabled()) {
LOG.debug("\n" + grid);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java Wed Dec 7 20:41:25 2016
@@ -414,8 +414,8 @@ public abstract class AbstractUISheet ex
for (final UIComponent child : header.getChildren()) {
if (child.isRendered()) {
- int columnSpan = ComponentUtils.getIntAttribute(child, Attributes.columnSpan, 1);
- int rowSpan = ComponentUtils.getIntAttribute(child, Attributes.rowSpan, 1);
+ int columnSpan = ComponentUtils.getIntAttribute(child, Attributes.column, 1);
+ int rowSpan = ComponentUtils.getIntAttribute(child, Attributes.row, 1);
grid.add(new OriginCell(child), columnSpan, rowSpan);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java Wed Dec 7 20:41:25 2016
@@ -33,6 +33,10 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
/**
+ * <p>
+ * WARNING: This component is preliminary and may be changed without a major release.
+ * </p>
+ *
* Renders a GridLayout.
* <pre>
* columns/rows ::= LAYOUT
@@ -93,7 +97,6 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIGridLayout",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout",
- uiComponentFacesClass = "javax.faces.component.UIComponentBase",
componentFamily = AbstractUIGridLayout.COMPONENT_FAMILY,
rendererType = RendererTypes.GRID_LAYOUT,
allowedChildComponenents = "NONE")
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java (from r1772448, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java&r1=1772448&r2=1773140&rev=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java Wed Dec 7 20:41:25 2016
@@ -26,223 +26,21 @@ import org.apache.myfaces.tobago.apt.ann
import javax.el.ValueExpression;
/**
- * Add GridLayoutConstraints to the parent UIComponent.
+ * Add a column span or row span to the parent UIComponent, useful for a grid layout.
*/
-@Tag(name = "gridLayoutConstraint")
-@SimpleTag(faceletHandler = "org.apache.myfaces.tobago.facelets.GridLayoutConstraintHandler")
-public interface GridLayoutConstraintTagDeclaration {
+@Tag(name = "span")
+@SimpleTag(faceletHandler = "org.apache.myfaces.tobago.facelets.SpanHandler")
+public interface SpanTagDeclaration {
/**
* The number of horizontal cells this component should use.
*/
- @TagAttribute(name = "columnSpan", type = "java.lang.Integer")
- void setColumnSpan(final ValueExpression columnSpan);
+ @TagAttribute(type = "java.lang.Integer")
+ void setColumn(final ValueExpression column);
/**
* The number of vertical cells this component should use.
*/
- @TagAttribute(name = "rowSpan", type = "java.lang.Integer")
- void setRowSpan(final ValueExpression rowSpan);
-
-/*
-*
- * The width for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "width", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setWidth(final ValueExpression width);
-
-*
- * The height for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "height", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setHeight(final ValueExpression height);
-
-*
- * The minimum width for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "minimumWidth", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setMinimumWidth(final ValueExpression minimumWidth);
-
-*
- * The minimum height for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "minimumHeight", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setMinimumHeight(final ValueExpression minimumHeight);
-
-*
- * The preferred width for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "preferredWidth", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setPreferredWidth(final ValueExpression preferredWidth);
-
-*
- * The preferred height for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "preferredHeight", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setPreferredHeight(final ValueExpression preferredHeight);
-
-*
- * The maximum width for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "maximumWidth", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setMaximumWidth(final ValueExpression maximumWidth);
-
-*
- * The maximum height for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "maximumHeight", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setMaximumHeight(final ValueExpression maximumHeight);
-
-*
- * The left margin for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "marginLeft", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setMarginLeft(final ValueExpression marginLeft);
-
-*
- * The right margin for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "marginRight", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setMarginRight(final ValueExpression marginRight);
-
-*
- * The top margin for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "marginTop", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setMarginTop(final ValueExpression marginTop);
-
-*
- * The bottom margin for this component.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "marginBottom", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setMarginBottom(final ValueExpression marginBottom);
-
-*
- * The left border area for this component. Its only applicably for containers.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "borderLeft", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setBorderLeft(final ValueExpression borderLeft);
-
-*
- * The right border area for this component. Its only applicably for containers.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "borderRight", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setBorderRight(final ValueExpression borderRight);
-
-*
- * The top border area for this component. Its only applicably for containers.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "borderTop", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setBorderTop(final ValueExpression borderTop);
-
-*
- * The bottom border area for this component. Its only applicably for containers.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "borderBottom", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setBorderBottom(final ValueExpression borderBottom);
-
-*
- * The left padding for this component. Its only applicably for containers.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "paddingLeft", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setPaddingLeft(final ValueExpression paddingLeft);
-
-*
- * The right padding for this component. Its only applicably for containers.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "paddingRight", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setPaddingRight(final ValueExpression paddingRight);
-
-*
- * The top padding for this component. Its only applicably for containers.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "paddingTop", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setPaddingTop(final ValueExpression paddingTop);
-
-*
- * The bottom padding for this component. Its only applicably for containers.
- * @deprecated since 3.0.0. Use <tc:style> instead.
-
-
- @Deprecated
- @TagAttribute(name = "paddingBottom", type = "java.lang.Object")
- @UIComponentTagAttribute(type = "java.lang.Object")
- void setPaddingBottom(final ValueExpression paddingBottom);
-*/
+ @TagAttribute(type = "java.lang.Integer")
+ void setRow(final ValueExpression row);
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml Wed Dec 7 20:41:25 2016
@@ -131,11 +131,11 @@
</tc:panel>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:panel>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
<tc:panel>
<f:facet name="layout">
<tc:gridLayout columns="*;auto"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml Wed Dec 7 20:41:25 2016
@@ -31,7 +31,7 @@
</f:facet>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:panel>
<tc:panel/>
@@ -59,7 +59,7 @@
<tc:panel/>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:panel>
</tc:panel>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml Wed Dec 7 20:41:25 2016
@@ -27,7 +27,7 @@
</f:facet>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:panel>
<tc:panel/>
@@ -51,7 +51,7 @@
<tc:panel/>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:panel>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml Wed Dec 7 20:41:25 2016
@@ -27,7 +27,7 @@
</f:facet>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:panel>
<tc:panel/>
@@ -49,7 +49,7 @@
<tc:panel/>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:panel>
</tc:page>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml Wed Dec 7 20:41:25 2016
@@ -26,7 +26,7 @@
</f:facet>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:panel>
<tc:panel/>
@@ -50,7 +50,7 @@
<tc:panel/>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:panel>
</tc:page>
</f:view>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml Wed Dec 7 20:41:25 2016
@@ -27,9 +27,9 @@
The facet could be filled with <code class="language-markup"><tc:out/></code> tags
to set the names of the header.
Such an outputfield tag may also contain
- <code class="language-markup"><tc:gridLayoutConstraint columnSpan="..."/></code>
+ <code class="language-markup"><tc:span column="..."/></code>
or
- <code class="language-markup"><tc:gridLayoutConstraint rowSpan="..."/></code>
+ <code class="language-markup"><tc:span row="..."/></code>
to set a span over columns or rows.</p>
<p>Tag Library Documentation:
<tc:link label="<tc:sheet/>" image="#{request.contextPath}/image/feather-leaf.png"
@@ -38,7 +38,7 @@
<tc:link label="<tc:column/>" image="#{request.contextPath}/image/feather-leaf.png"
link="#{demoBundle.tagDocUrl}/column.html"/>
|
- <tc:link label="<tc:gridLayoutConstraint/>" image="#{request.contextPath}/image/feather-leaf.png"
+ <tc:link label="<tc:span/>" image="#{request.contextPath}/image/feather-leaf.png"
link="#{demoBundle.tagDocUrl}/gridLayoutConstraint.html"/></p>
<tc:section label="Multi-Header">
@@ -47,39 +47,39 @@
columns="3*;2*;30px;2*;2*;2*;2*;2*;2*" markup="bordered">
<f:facet name="header">
<tc:out value="Name">
- <tc:gridLayoutConstraint rowSpan="3"/>
+ <tc:span row="3"/>
</tc:out>
<tc:out value="Information">
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
...</code></pre>
<tc:sheet value="#{sheetController.solarList}" var="luminary" rows="11"
columns="3*;2*;30px;2*;2*;2*;2*;2*;2*" markup="bordered">
<f:facet name="header">
<tc:panel>
<tc:out value="Name">
- <tc:gridLayoutConstraint rowSpan="3"/>
+ <tc:span row="3"/>
</tc:out>
<tc:out value="Information">
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:out>
<tc:out value="Data">
- <tc:gridLayoutConstraint columnSpan="4"/>
+ <tc:span column="4"/>
</tc:out>
<tc:out value="Discovery">
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:out>
<tc:out value="Orbit">
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:out>
<tc:out value="Orb">
- <tc:gridLayoutConstraint columnSpan="3"/>
+ <tc:span column="3"/>
</tc:out>
<tc:out value="Name">
- <tc:gridLayoutConstraint rowSpan="2"/>
+ <tc:span row="2"/>
</tc:out>
<tc:out value="Year">
- <tc:gridLayoutConstraint rowSpan="2"/>
+ <tc:span row="2"/>
</tc:out>
<tc:out value="of"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/error.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/error.xhtml Wed Dec 7 20:41:25 2016
@@ -27,7 +27,7 @@
<tc:gridLayout rows="35px;35px;35px;35px" columns="100px;*">
<tc:flowLayout>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
<tc:out
value="When using MyFaces or Facelets you have to turn off the exception mechanism of them to use this demo. See in the MyFaces Wiki: "/>
<tc:link link="http://wiki.apache.org/myfaces/Handling_Server_Errors" label="Handling Server Errors"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/partial.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/partial.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/partial.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/partial.xhtml Wed Dec 7 20:41:25 2016
@@ -82,32 +82,32 @@
<tc:button label="Reload both" tip="Reload both boxes"
action="#{partialReloadController.reload}">
<f:ajax render="left right :page:header:headerInfo"/>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:button>
<tc:button label="Reload full panel"
tip="Reload the full area inside the outer box"
action="#{partialReloadController.reload}">
<f:ajax render="parent :page:header:headerInfo"/>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:button>
<tc:button label="Reload both (wait 3 s)"
tip="Reload both boxes, but the server has a delay of 3 seconds"
action="#{partialReloadController.waitAndReload3}">
<f:ajax render="left right :page:header:headerInfo"/>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:button>
<tc:button label="Reload both (wait 7 s, timeout)"
tip="Reload both boxes, but the server has a delay of 7 seconds, this is more than the default timeout for AJAX"
action="#{partialReloadController.waitAndReload7}">
<f:ajax render="left right :page:header:headerInfo"/>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:button>
<tc:panel id="navTest">
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
<tc:selectOneChoice fieldId="navSelect" value="#{partialReloadController.navigateActionValue}"
label="On Change">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/70-grid-layout/grid-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/70-grid-layout/grid-layout.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/70-grid-layout/grid-layout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/70-grid-layout/grid-layout.xhtml Wed Dec 7 20:41:25 2016
@@ -50,7 +50,7 @@
<tc:in label="Last Name"/>
<tc:in label="c/o">
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:in>
<tc:in label="Street"/>
@@ -60,7 +60,7 @@
<tc:in label="City"/>
<tc:textarea label="Note">
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:textarea>
</tc:gridLayout>
</tc:box>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/type-of-literals.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/type-of-literals.xhtml?rev=1773140&r1=1773139&r2=1773140&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/type-of-literals.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/type-of-literals.xhtml Wed Dec 7 20:41:25 2016
@@ -24,7 +24,7 @@
<tc:gridLayout rows="auto;80px;80px;auto;*" columns="4*;*">
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
<tc:messages/>
</tc:panel>
@@ -50,7 +50,7 @@
<tc:button label="submit"/>
<tc:panel>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:span column="2"/>
</tc:panel>
</tc:gridLayout>