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 2012/05/29 15:48:37 UTC
svn commit: r1343725 - in /myfaces/tobago/branches/tobago-1.5.x: ./
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
Author: lofwyr
Date: Tue May 29 13:48:36 2012
New Revision: 1343725
URL: http://svn.apache.org/viewvc?rev=1343725&view=rev
Log:
Merged from trunk
spelling [from revision 1343719]
Modified:
myfaces/tobago/branches/tobago-1.5.x/ (props changed)
myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
Propchange: myfaces/tobago/branches/tobago-1.5.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1343719
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=1343725&r1=1343724&r2=1343725&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Tue May 29 13:48:36 2012
@@ -369,7 +369,7 @@ public abstract class AbstractUIGridLayo
((LayoutContainer) component).getLayoutManager().postProcessing(orientation);
}
- // set scrolling stype
+ // set scrolling type
final boolean scroll = grid.isOverflow(orientation);
if (orientation == Orientation.HORIZONTAL) {
getLayoutContainer().setOverflowX(scroll);
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java?rev=1343725&r1=1343724&r2=1343725&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java Tue May 29 13:48:36 2012
@@ -104,7 +104,7 @@ public interface GridLayoutTagDeclaratio
/**
* This attribute is a hint for the layout manager. Should not be used in most cases.
*
- * @param columnOverflow Does the component need a horizontal scollbar?
+ * @param columnOverflow Does the component need a horizontal scrollbar?
*/
@TagAttribute
@UIComponentTagAttribute(
@@ -114,7 +114,7 @@ public interface GridLayoutTagDeclaratio
/**
* This attribute is a hint for the layout manager. Should not be used in most cases.
*
- * @param rowOverflow Does the component need a vertical scollbar?
+ * @param rowOverflow Does the component need a vertical scrollbar?
*/
@TagAttribute
@UIComponentTagAttribute(