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 2010/05/03 15:11:42 UTC
svn commit: r940442 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/internal/component/
core/src/main/java/org/apache/myfaces/tobago/internal/layout/
core/src/main/java/or...
Author: lofwyr
Date: Mon May 3 13:11:42 2010
New Revision: 940442
URL: http://svn.apache.org/viewvc?rev=940442&view=rev
Log:
TOBAGO-606: new layout manager
- rename leftOffset to offsetLeft, ... to keep a consistent naming schema.
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java
myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java Mon May 3 13:11:42 2010
@@ -30,7 +30,6 @@ public final class Attributes {
public static final String AUTO_RELOAD = "autoReload";
public static final String BODY_CONTENT = "bodyContent";
public static final String BORDER = "border";
- public static final String BOTTOM_OFFSET = "bottomOffset";
public static final String CHARSET = "charset";
@Deprecated
public static final String CELLSPACING = "cellspacing";
@@ -84,7 +83,6 @@ public final class Attributes {
public static final String LAYOUT_ORDER = "layoutOrder";
public static final String LAYOUT_WIDTH = "layoutWidth";
public static final String LEFT = "left";
- public static final String LEFT_OFFSET = "leftOffset";
public static final String LINK = "link";
public static final String MARGIN = "margin";
public static final String MARGIN_BOTTOM = "marginBottom";
@@ -109,6 +107,10 @@ public final class Attributes {
public static final String NAME = "name";
public static final String NAVIGATE = "navigate";
public static final String NUMBER_STYLE = "numberStyle";
+ public static final String OFFSET_BOTTOM = "offsetBottom";
+ public static final String OFFSET_LEFT = "offsetLeft";
+ public static final String OFFSET_RIGHT = "offsetRight";
+ public static final String OFFSET_TOP = "offsetTop";
public static final String ONCHANGE = "onchange";
public static final String ONCLICK = "onclick";
public static final String ORDER_BY = "orderBy";
@@ -133,7 +135,6 @@ public final class Attributes {
public static final String RENDER_RANGE_EXTERN = "renderRangeExtern";
public static final String REQUIRED = "required";
public static final String RESOURCE = "resource";
- public static final String RIGHT_OFFSET = "rightOffset";
public static final String ROW_ID = "rowId";
public static final String ROW_SPAN = "rowSpan";
public static final String ROW_SPACING = "rowSpacing";
@@ -175,7 +176,6 @@ public final class Attributes {
public static final String TITLE = "title";
public static final String TIP = "tip";
public static final String TOP = "top";
- public static final String TOP_OFFSET = "topOffset";
public static final String TRANSITION = "transition";
public static final String TYPE = "type";
public static final String VALUE = "value";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Mon May 3 13:11:42 2010
@@ -185,11 +185,11 @@ public abstract class AbstractUIGridLayo
}
if (sum != null) {
// adding the space between the cells
- sum = sum.add(LayoutUtils.getBeginOffset(orientation, getLayoutContainer()));
+ sum = sum.add(LayoutUtils.getOffsetBegin(orientation, getLayoutContainer()));
sum = sum.add(getMarginBegin(orientation));
sum = sum.add(computeSpacing(orientation, 0, heads.length));
sum = sum.add(getMarginEnd(orientation));
- sum = sum.add(LayoutUtils.getEndOffset(orientation, getLayoutContainer()));
+ sum = sum.add(LayoutUtils.getOffsetEnd(orientation, getLayoutContainer()));
LayoutUtils.setCurrentSize(orientation, getLayoutContainer(), sum);
}
}
@@ -214,11 +214,11 @@ public abstract class AbstractUIGridLayo
for (BankHead head : heads) {
available = available.subtractNotNegative(head.getCurrent());
}
- available = available.subtractNotNegative(LayoutUtils.getBeginOffset(orientation, container));
+ available = available.subtractNotNegative(LayoutUtils.getOffsetBegin(orientation, container));
available = available.subtractNotNegative(getMarginBegin(orientation));
available = available.subtractNotNegative(computeSpacing(orientation, 0, heads.length));
available = available.subtractNotNegative(getMarginEnd(orientation));
- available = available.subtractNotNegative(LayoutUtils.getEndOffset(orientation, container));
+ available = available.subtractNotNegative(LayoutUtils.getOffsetEnd(orientation, container));
List<Measure> partition = factorList.partition(available);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Mon May 3 13:11:42 2010
@@ -82,8 +82,8 @@ public abstract class AbstractUISheetLay
if (intervals.size() >= 1) {
intervals.evaluate();
Measure size = intervals.getCurrent();
- size = size.add(LayoutUtils.getBeginOffset(orientation, getLayoutContainer()));
- size = size.add(LayoutUtils.getEndOffset(orientation, getLayoutContainer()));
+ size = size.add(LayoutUtils.getOffsetBegin(orientation, getLayoutContainer()));
+ size = size.add(LayoutUtils.getOffsetEnd(orientation, getLayoutContainer()));
// todo LayoutUtils.setSize(orientation, getLayoutContainer(), size);
}
}
@@ -97,8 +97,8 @@ public abstract class AbstractUISheetLay
LayoutContainer container = getLayoutContainer();
Measure available = LayoutUtils.getCurrentSize(orientation, container);
if (available != null) {
- available = available.subtractNotNegative(LayoutUtils.getBeginOffset(orientation, container));
- available = available.subtractNotNegative(LayoutUtils.getEndOffset(orientation, container));
+ available = available.subtractNotNegative(LayoutUtils.getOffsetBegin(orientation, container));
+ available = available.subtractNotNegative(LayoutUtils.getOffsetEnd(orientation, container));
for (LayoutComponent component : getLayoutContainer().getComponents()) {
@@ -126,7 +126,7 @@ public abstract class AbstractUISheetLay
component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and style.css
// compute the position of the cell
- Measure position = LayoutUtils.getBeginOffset(orientation, getLayoutContainer());
+ Measure position = LayoutUtils.getOffsetBegin(orientation, getLayoutContainer());
if (orientation == Orientation.HORIZONTAL) {
component.setLeft(position);
} else {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java Mon May 3 13:11:42 2010
@@ -78,8 +78,8 @@ public abstract class AbstractUITabGroup
if (intervals.size() >= 1) {
intervals.evaluate();
Measure size = intervals.getCurrent();
- size = size.add(LayoutUtils.getBeginOffset(orientation, getLayoutContainer()));
- size = size.add(LayoutUtils.getEndOffset(orientation, getLayoutContainer()));
+ size = size.add(LayoutUtils.getOffsetBegin(orientation, getLayoutContainer()));
+ size = size.add(LayoutUtils.getOffsetEnd(orientation, getLayoutContainer()));
LayoutUtils.setCurrentSize(orientation, getLayoutContainer(), size);
}
}
@@ -93,8 +93,8 @@ public abstract class AbstractUITabGroup
LayoutContainer container = getLayoutContainer();
Measure available = LayoutUtils.getCurrentSize(orientation, container);
if (available != null) {
- available = available.subtractNotNegative(LayoutUtils.getBeginOffset(orientation, container));
- available = available.subtractNotNegative(LayoutUtils.getEndOffset(orientation, container));
+ available = available.subtractNotNegative(LayoutUtils.getOffsetBegin(orientation, container));
+ available = available.subtractNotNegative(LayoutUtils.getOffsetEnd(orientation, container));
for (LayoutComponent component : getLayoutContainer().getComponents()) {
@@ -122,7 +122,7 @@ public abstract class AbstractUITabGroup
component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and style.css
// compute the position of the cell
- Measure position = LayoutUtils.getBeginOffset(orientation, getLayoutContainer());
+ Measure position = LayoutUtils.getOffsetBegin(orientation, getLayoutContainer());
if (orientation == Orientation.HORIZONTAL) {
component.setLeft(position);
} else {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java Mon May 3 13:11:42 2010
@@ -129,12 +129,12 @@ public final class LayoutUtils {
}
}
- public static Measure getEndOffset(Orientation orientation, LayoutContainer container) {
- return orientation == Orientation.HORIZONTAL ? container.getRightOffset() : container.getBottomOffset();
+ public static Measure getOffsetEnd(Orientation orientation, LayoutContainer container) {
+ return orientation == Orientation.HORIZONTAL ? container.getOffsetRight() : container.getOffsetBottom();
}
- public static Measure getBeginOffset(Orientation orientation, LayoutContainer container) {
- return orientation == Orientation.HORIZONTAL ? container.getLeftOffset() : container.getTopOffset();
+ public static Measure getOffsetBegin(Orientation orientation, LayoutContainer container) {
+ return orientation == Orientation.HORIZONTAL ? container.getOffsetLeft() : container.getOffsetTop();
}
public static Measure getCurrentSize(Orientation orientation, LayoutContainer container) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutContainer.java Mon May 3 13:11:42 2010
@@ -26,11 +26,11 @@ public interface LayoutContainer extends
LayoutManager getLayoutManager();
void setLayoutManager(LayoutManager layoutManager);
- Measure getLeftOffset();
+ Measure getOffsetLeft();
- Measure getRightOffset();
+ Measure getOffsetRight();
- Measure getTopOffset();
+ Measure getOffsetTop();
- Measure getBottomOffset();
+ Measure getOffsetBottom();
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java Mon May 3 13:11:42 2010
@@ -58,19 +58,19 @@ public abstract class AbstractLayoutable
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMaximumHeight(facesContext, component);
}
- public Measure getLeftOffset(FacesContext facesContext, Configurable component) {
- return ((LayoutComponentRenderer) getRenderer(facesContext)).getLeftOffset(facesContext, component);
+ public Measure getOffsetLeft(FacesContext facesContext, Configurable component) {
+ return ((LayoutComponentRenderer) getRenderer(facesContext)).getOffsetLeft(facesContext, component);
}
- public Measure getRightOffset(FacesContext facesContext, Configurable component) {
- return ((LayoutComponentRenderer) getRenderer(facesContext)).getRightOffset(facesContext, component);
+ public Measure getOffsetRight(FacesContext facesContext, Configurable component) {
+ return ((LayoutComponentRenderer) getRenderer(facesContext)).getOffsetRight(facesContext, component);
}
- public Measure getTopOffset(FacesContext facesContext, Configurable component) {
- return ((LayoutComponentRenderer) getRenderer(facesContext)).getTopOffset(facesContext, component);
+ public Measure getOffsetTop(FacesContext facesContext, Configurable component) {
+ return ((LayoutComponentRenderer) getRenderer(facesContext)).getOffsetTop(facesContext, component);
}
- public Measure getBottomOffset(FacesContext facesContext, Configurable component) {
- return ((LayoutComponentRenderer) getRenderer(facesContext)).getBottomOffset(facesContext, component);
+ public Measure getOffsetBottom(FacesContext facesContext, Configurable component) {
+ return ((LayoutComponentRenderer) getRenderer(facesContext)).getOffsetBottom(facesContext, component);
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRenderer.java Mon May 3 13:11:42 2010
@@ -40,11 +40,11 @@ public interface LayoutComponentRenderer
Measure getMaximumHeight(FacesContext facesContext, Configurable component);
- Measure getLeftOffset(FacesContext facesContext, Configurable component);
+ Measure getOffsetLeft(FacesContext facesContext, Configurable component);
- Measure getRightOffset(FacesContext facesContext, Configurable component);
+ Measure getOffsetRight(FacesContext facesContext, Configurable component);
- Measure getTopOffset(FacesContext facesContext, Configurable component);
+ Measure getOffsetTop(FacesContext facesContext, Configurable component);
- Measure getBottomOffset(FacesContext facesContext, Configurable component);
+ Measure getOffsetBottom(FacesContext facesContext, Configurable component);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java Mon May 3 13:11:42 2010
@@ -57,19 +57,19 @@ public abstract class LayoutComponentRen
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MAXIMUM_HEIGHT);
}
- public Measure getLeftOffset(FacesContext facesContext, Configurable component) {
- return getResourceManager().getThemeMeasure(facesContext, component, Attributes.LEFT_OFFSET);
+ public Measure getOffsetLeft(FacesContext facesContext, Configurable component) {
+ return getResourceManager().getThemeMeasure(facesContext, component, Attributes.OFFSET_LEFT);
}
- public Measure getRightOffset(FacesContext facesContext, Configurable component) {
- return getResourceManager().getThemeMeasure(facesContext, component, Attributes.RIGHT_OFFSET);
+ public Measure getOffsetRight(FacesContext facesContext, Configurable component) {
+ return getResourceManager().getThemeMeasure(facesContext, component, Attributes.OFFSET_RIGHT);
}
- public Measure getTopOffset(FacesContext facesContext, Configurable component) {
- return getResourceManager().getThemeMeasure(facesContext, component, Attributes.TOP_OFFSET);
+ public Measure getOffsetTop(FacesContext facesContext, Configurable component) {
+ return getResourceManager().getThemeMeasure(facesContext, component, Attributes.OFFSET_TOP);
}
- public Measure getBottomOffset(FacesContext facesContext, Configurable component) {
- return getResourceManager().getThemeMeasure(facesContext, component, Attributes.BOTTOM_OFFSET);
+ public Measure getOffsetBottom(FacesContext facesContext, Configurable component) {
+ return getResourceManager().getThemeMeasure(facesContext, component, Attributes.OFFSET_BOTTOM);
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java Mon May 3 13:11:42 2010
@@ -24,42 +24,42 @@ public interface IsGridLayoutContainer {
/**
* This attribute is for internal use only.
*
- * @param leftOffset The left offset which is needed by some containers (e. g. a box).
+ * @param offsetLeft The left offset which is needed by some containers (e. g. a box).
*/
@UIComponentTagAttribute(
type = "org.apache.myfaces.tobago.layout.Measure",
defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getLeftOffset(getFacesContext(), this)")
- void setLeftOffset(String leftOffset);
+ + "getRenderer(getFacesContext())).getOffsetLeft(getFacesContext(), this)")
+ void setOffsetLeft(String offsetLeft);
/**
* This attribute is for internal use only.
*
- * @param rightOffset The right offset which is needed by some containers (e. g. a box).
+ * @param offsetRight The right offset which is needed by some containers (e. g. a box).
*/
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getRightOffset(getFacesContext(), this)")
- void setRightOffset(String rightOffset);
+ + "getRenderer(getFacesContext())).getOffsetRight(getFacesContext(), this)")
+ void setOffsetRight(String offsetRight);
/**
* This attribute is for internal use only.
*
- * @param topOffset The top offset which is needed by some containers (e. g. a box).
+ * @param offsetTop The top offset which is needed by some containers (e. g. a box).
*/
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getTopOffset(getFacesContext(), this)")
- void setTopOffset(String topOffset);
+ + "getRenderer(getFacesContext())).getOffsetTop(getFacesContext(), this)")
+ void setOffsetTop(String offsetTop);
/**
* This attribute is for internal use only.
*
- * @param bottomOffset The bottom offset which is needed by some containers (e. g. a box).
+ * @param offsetBottom The bottom offset which is needed by some containers (e. g. a box).
*/
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getBottomOffset(getFacesContext(), this)")
- void setBottomOffset(String bottomOffset);
+ + "getRenderer(getFacesContext())).getOffsetBottom(getFacesContext(), this)")
+ void setOffsetBottom(String offsetBottom);
}
Modified: myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/property/tobago-theme-config.properties?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/property/tobago-theme-config.properties Mon May 3 13:11:42 2010
@@ -24,7 +24,7 @@ Box.css.border-left-width=1
Box.css.border-top-width=1
Box.css.border-right-width=1
Box.css.border-bottom-width=1
-Box.leftOffset=1
-Box.topOffset=21
-Box.rightOffset=1
-Box.bottomOffset=1
+Box.offsetLeft=1
+Box.offsetTop=21
+Box.offsetRight=1
+Box.offsetBottom=1
Modified: myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/property/tobago-theme-config.properties?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/property/tobago-theme-config.properties Mon May 3 13:11:42 2010
@@ -24,10 +24,10 @@ Box.css.border-left-width=1
Box.css.border-top-width=1
Box.css.border-right-width=1
Box.css.border-bottom-width=1
-Box.leftOffset=1
-Box.topOffset=21
-Box.rightOffset=1
-Box.bottomOffset=1
+Box.offsetLeft=1
+Box.offsetTop=21
+Box.offsetRight=1
+Box.offsetBottom=1
# padding-top + padding-bottom + border-top + border-bottom
TabGroup.paddingHeight=28
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java Mon May 3 13:11:42 2010
@@ -86,14 +86,14 @@ public class BoxRenderer extends BoxRend
writer.startElement(HtmlConstants.DIV, box);
writer.writeClassAttribute("tobago-box-content"); // needed to be scrollable inside of the box
writer.writeStyleAttribute(contentStyle);
- final Measure leftOffset = getLeftOffset(facesContext, box);
- final Measure rightOffset = getRightOffset(facesContext, box);
- final Measure topOffset = getTopOffset(facesContext, box);
- final Measure bottomOffset = getBottomOffset(facesContext, box);
- contentStyle.setWidth(contentStyle.getWidth().subtract(leftOffset).subtract(rightOffset));
- contentStyle.setHeight(contentStyle.getHeight().subtract(topOffset).subtract(bottomOffset));
- contentStyle.setLeft(leftOffset);
- contentStyle.setTop(topOffset);
+ final Measure offsetLeft = getOffsetLeft(facesContext, box);
+ final Measure offsetRight = getOffsetRight(facesContext, box);
+ final Measure offsetTop = getOffsetTop(facesContext, box);
+ final Measure offsetBottom = getOffsetBottom(facesContext, box);
+ contentStyle.setWidth(contentStyle.getWidth().subtract(offsetLeft).subtract(offsetRight));
+ contentStyle.setHeight(contentStyle.getHeight().subtract(offsetTop).subtract(offsetBottom));
+ contentStyle.setLeft(offsetLeft);
+ contentStyle.setTop(offsetTop);
writer.writeStyleAttribute(contentStyle);
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Mon May 3 13:11:42 2010
@@ -495,9 +495,9 @@ public class PageRenderer extends PageRe
// XXX position the div, so that the scrollable area is correct.
// XXX better to take this fact into layout management.
// XXX is also useful in boxes, etc.
- Measure topOffset = getBottomOffset(facesContext, page);
- style.setHeight(page.getCurrentHeight().subtract(topOffset));
- style.setTop(topOffset);
+ Measure offset = getOffsetBottom(facesContext, page);
+ style.setHeight(page.getCurrentHeight().subtract(offset));
+ style.setTop(offset);
writer.writeStyleAttribute(style);
}
@@ -698,7 +698,7 @@ public class PageRenderer extends PageRe
}
@Override
- public Measure getBottomOffset(FacesContext facesContext, Configurable component) {
+ public Measure getOffsetBottom(FacesContext facesContext, Configurable component) {
// XXX this is a hack. correct whould be the top-offset, but this would shift the content, because of the
// XXX hack before the code: writer.writeStyleAttribute(style)
UIPage page = (UIPage) component;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Mon May 3 13:11:42 2010
@@ -973,7 +973,7 @@ public class SheetRenderer extends Layou
}
private Measure getContentBorder(FacesContext facesContext, UISheet data) {
- return getLeftOffset(facesContext, data).add(getRightOffset(facesContext, data));
+ return getOffsetLeft(facesContext, data).add(getOffsetRight(facesContext, data));
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Mon May 3 13:11:42 2010
@@ -37,10 +37,10 @@ Box.paddingHeight=31
Box.headerHeight=0
Box.paddingTopWhenToolbar=22
Box.extraPaddingHeightWhenToolbar=10
-Box.leftOffset=0
-Box.topOffset=0
-Box.rightOffset=0
-Box.bottomOffset=0
+Box.offsetLeft=0
+Box.offsetTop=0
+Box.offsetRight=0
+Box.offsetBottom=0
Button.fontWidth=8
Button.imageWidth=18
@@ -152,20 +152,20 @@ Sheet.rowHeight=18
Sheet.rowPadding=5
Sheet.selectorMenuWidth=20
Sheet.cellPaddingWidth=4
-Sheet.leftOffset=0
-Sheet.topOffset=0
-Sheet.rightOffset=0
-Sheet.bottomOffset=0
+Sheet.offsetLeft=0
+Sheet.offsetTop=0
+Sheet.offsetRight=0
+Sheet.offsetBottom=0
Sheet.verticalScrollbarWeight=17
Sheet.horizontalScrollbarWeight=17
Tab.paddingWidth=0
Tab.paddingHeight=0
Tab.headerHeight=0
-Tab.leftOffset=5
-Tab.topOffset=29
-Tab.rightOffset=5
-Tab.bottomOffset=5
+Tab.offsetLeft=5
+Tab.offsetTop=29
+Tab.offsetRight=5
+Tab.offsetBottom=5
TabGroup.fontWidth=8
TabGroup.paddingWidth=24
@@ -173,10 +173,10 @@ TabGroup.paddingHeight=25
TabGroup.headerHeight=24
TabGroup.tabLabelExtraWidth=20
TabGroup.navigationBarWidth=60
-TabGroup.leftOffset=1
-TabGroup.topOffset=0
-TabGroup.rightOffset=2
-TabGroup.bottomOffset=2
+TabGroup.offsetLeft=1
+TabGroup.offsetTop=0
+TabGroup.offsetRight=2
+TabGroup.offsetBottom=2
TextArea.headerHeight=0
TextArea.minimumHeight=36
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Mon May 3 13:11:42 2010
@@ -146,14 +146,14 @@ without shadow
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-box-content"); // needed to be scrollable inside of the box
final Style style = new Style(facesContext, box);
- final Measure leftOffset = getLeftOffset(facesContext, box);
- final Measure rightOffset = getRightOffset(facesContext, box);
- final Measure topOffset = getTopOffset(facesContext, box);
- final Measure bottomOffset = getBottomOffset(facesContext, box);
- style.setWidth(style.getWidth().subtract(leftOffset).subtract(rightOffset));
- style.setHeight(style.getHeight().subtract(topOffset).subtract(bottomOffset));
- style.setLeft(leftOffset);
- style.setTop(topOffset);
+ final Measure offsetLeft = getOffsetLeft(facesContext, box);
+ final Measure offsetRight = getOffsetRight(facesContext, box);
+ final Measure offsetTop = getOffsetTop(facesContext, box);
+ final Measure offsetBottom = getOffsetBottom(facesContext, box);
+ style.setWidth(style.getWidth().subtract(offsetLeft).subtract(offsetRight));
+ style.setHeight(style.getHeight().subtract(offsetTop).subtract(offsetBottom));
+ style.setLeft(offsetLeft);
+ style.setTop(offsetTop);
writer.writeStyleAttribute(style);
}
Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Mon May 3 13:11:42 2010
@@ -29,10 +29,10 @@ Box.paddingHeight=12
Box.paddingWidth=13
Box.componentExtraWidth=0
Box.componentExtraHeight=0
-Box.leftOffset=1
-Box.topOffset=21
-Box.rightOffset=2
-Box.bottomOffset=2
+Box.offsetLeft=1
+Box.offsetTop=21
+Box.offsetRight=2
+Box.offsetBottom=2
# activates the shadow
Box.shadow=1
@@ -94,25 +94,25 @@ Sheet.footerHeight=15
Sheet.rowPadding=3
Sheet.selectorMenuWidth=16
Sheet.cellPaddingWidth=4
-Sheet.leftOffset=1
-Sheet.rightOffset=1
+Sheet.offsetLeft=1
+Sheet.offsetRight=1
Tab.paddingWidth=0
Tab.paddingHeight=0
-Tab.leftOffset=0
-Tab.topOffset=0
-Tab.rightOffset=0
-Tab.bottomOffset=0
+Tab.offsetLeft=0
+Tab.offsetTop=0
+Tab.offsetRight=0
+Tab.offsetBottom=0
TabGroup.paddingHeight=22
TabGroup.paddingWidth=23
TabGroup.headerHeight=19
TabGroup.tabLabelExtraWidth=20
TabGroup.navigationBarWidth=60
-TabGroup.leftOffset=1
-TabGroup.topOffset=19
-TabGroup.rightOffset=2
-TabGroup.bottomOffset=2
+TabGroup.offsetLeft=1
+TabGroup.offsetTop=19
+TabGroup.offsetRight=2
+TabGroup.offsetBottom=2
TextArea.minimumHeight=33
TextArea.css.border-left-width=1
Modified: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties?rev=940442&r1=940441&r2=940442&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties Mon May 3 13:11:42 2010
@@ -23,10 +23,10 @@ Box.marginRight=5
Box.marginTop=5
Box.marginBottom=5
-Cell.leftOffset=0
-Cell.topOffset=0
-Cell.rightOffset=0
-Cell.bottomOffset=0
+Cell.offsetLeft=0
+Cell.offsetTop=0
+Cell.offsetRight=0
+Cell.offsetBottom=0
Cell.css.border-left-width=0
Cell.css.border-top-width=0
Cell.css.border-right-width=0
@@ -53,22 +53,22 @@ Label.css.padding-bottom=0
Messages.preferredHeight=20
Messages.height=20
-Page.leftOffset=0
-Page.topOffset=0
-Page.rightOffset=0
-Page.bottomOffset=0
+Page.offsetLeft=0
+Page.offsetTop=0
+Page.offsetRight=0
+Page.offsetBottom=0
Page.width=1024
Page.height=768
-Panel.leftOffset=0
-Panel.topOffset=0
-Panel.rightOffset=0
-Panel.bottomOffset=0
-
-Popup.leftOffset=0
-Popup.topOffset=0
-Popup.rightOffset=0
-Popup.bottomOffset=0
+Panel.offsetLeft=0
+Panel.offsetTop=0
+Panel.offsetRight=0
+Panel.offsetBottom=0
+
+Popup.offsetLeft=0
+Popup.offsetTop=0
+Popup.offsetRight=0
+Popup.offsetBottom=0
Separator.css.border-left-width=0
Separator.css.border-top-width=0