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 2009/11/17 12:03:48 UTC
svn commit: r881242 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
component/ renderkit/ taglib/component/ taglib/decl/
Author: lofwyr
Date: Tue Nov 17 11:03:47 2009
New Revision: 881242
URL: http://svn.apache.org/viewvc?rev=881242&view=rev
Log:
TOBAGO-606: Get offset via the renderer, so overriding is possible
Added:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java
- copied, changed from r880704, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java
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/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/component/BoxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/WizardTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponentWithDeprecatedDimension.java
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=881242&r1=881241&r2=881242&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 Tue Nov 17 11:03:47 2009
@@ -30,6 +30,7 @@
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";
@@ -68,7 +69,9 @@
public static final String IMMEDIATE = "immediate";
public static final String IMAGE = "image";
public static final String INLINE = "inline";
+ @Deprecated
public static final String INNER_HEIGHT = "innerHeight";
+ @Deprecated
public static final String INNER_WIDTH = "innerWidth";
public static final String ITEM_DESCRIPTION = "itemDescription";
public static final String ITEM_DISABLED = "itemDisabled";
@@ -82,6 +85,7 @@
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";
@@ -132,6 +136,7 @@
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";
@@ -172,6 +177,7 @@
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/renderkit/AbstractLayoutableRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java?rev=881242&r1=881241&r2=881242&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 Tue Nov 17 11:03:47 2009
@@ -57,4 +57,20 @@
public Measure getMaximumHeight(FacesContext facesContext, UIComponent component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMaximumHeight(facesContext, component);
}
+
+ public Measure getLeftOffset(FacesContext facesContext, UIComponent component) {
+ return ((LayoutComponentRenderer) getRenderer(facesContext)).getLeftOffset(facesContext, component);
+ }
+
+ public Measure getRightOffset(FacesContext facesContext, UIComponent component) {
+ return ((LayoutComponentRenderer) getRenderer(facesContext)).getRightOffset(facesContext, component);
+ }
+
+ public Measure getTopOffset(FacesContext facesContext, UIComponent component) {
+ return ((LayoutComponentRenderer) getRenderer(facesContext)).getTopOffset(facesContext, component);
+ }
+
+ public Measure getBottomOffset(FacesContext facesContext, UIComponent component) {
+ return ((LayoutComponentRenderer) getRenderer(facesContext)).getBottomOffset(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=881242&r1=881241&r2=881242&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 Tue Nov 17 11:03:47 2009
@@ -40,4 +40,12 @@
Measure getMaximumHeight(FacesContext facesContext, UIComponent component);
+ Measure getLeftOffset(FacesContext facesContext, UIComponent component);
+
+ Measure getRightOffset(FacesContext facesContext, UIComponent component);
+
+ Measure getTopOffset(FacesContext facesContext, UIComponent component);
+
+ Measure getBottomOffset(FacesContext facesContext, UIComponent 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=881242&r1=881241&r2=881242&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 Tue Nov 17 11:03:47 2009
@@ -57,4 +57,20 @@
public Measure getMaximumHeight(FacesContext facesContext, UIComponent component) {
return ThemeConfig.getMeasure(facesContext, component.getRendererType(), Attributes.MAXIMUM_HEIGHT);
}
+
+ public Measure getLeftOffset(FacesContext facesContext, UIComponent component) {
+ return ThemeConfig.getMeasure(facesContext, component.getRendererType(), Attributes.LEFT_OFFSET);
+ }
+
+ public Measure getRightOffset(FacesContext facesContext, UIComponent component) {
+ return ThemeConfig.getMeasure(facesContext, component.getRendererType(), Attributes.RIGHT_OFFSET);
+ }
+
+ public Measure getTopOffset(FacesContext facesContext, UIComponent component) {
+ return ThemeConfig.getMeasure(facesContext, component.getRendererType(), Attributes.TOP_OFFSET);
+ }
+
+ public Measure getBottomOffset(FacesContext facesContext, UIComponent component) {
+ return ThemeConfig.getMeasure(facesContext, component.getRendererType(), Attributes.BOTTOM_OFFSET);
+ }
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -19,13 +19,14 @@
import org.apache.myfaces.tobago.apt.annotation.Facet;
import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
/**
* Renders a panel with border and title.
@@ -43,14 +44,6 @@
@Facet(name=Facets.LAYOUT, description = "Contains an instance of UILayout",
allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
-
-public interface BoxTagDeclaration extends HasIdBindingAndRendered, HasLabel {
-
- /**
- * Indicate markup of this component.
- * Possible value is 'none'. But this can be overridden in the theme.
- */
- @TagAttribute
- @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
- void setMarkup(String markup);
+public interface BoxTagDeclaration
+ extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasLabel {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -24,6 +24,7 @@
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
/**
* Renders a panel-like layout element with the ability to span over more than
@@ -37,7 +38,7 @@
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUICell",
componentType = "org.apache.myfaces.tobago.Cell",
rendererType = RendererTypes.CELL)
-public interface CellTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent {
+public interface CellTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer {
@UIComponentTagAttribute(type = {"java.lang.Integer"},
defaultValue = "1")
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -28,6 +28,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasTip;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponentWithDeprecatedDimension;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
/**
* Renders a Image.
@@ -39,7 +40,8 @@
rendererType = RendererTypes.IMAGE,
allowedChildComponenents = "NONE")
public interface ImageTagDeclaration
- extends HasIdBindingAndRendered, HasBorder, HasTip, IsDisabled, IsGridLayoutComponentWithDeprecatedDimension {
+ extends HasIdBindingAndRendered, HasBorder, HasTip, IsDisabled,
+ IsGridLayoutComponentWithDeprecatedDimension, IsGridLayoutContainer {
/**
* Absolute url to an image or image name to lookup in tobago resource path
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -29,6 +29,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
import org.apache.myfaces.tobago.taglib.decl.HasState;
import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponentWithDeprecatedDimension;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
/**
* Renders a page element.
@@ -52,7 +53,8 @@
allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
public interface PageTagDeclaration
- extends HasLabel, HasId, HasBinding, HasState, IsGridLayoutComponentWithDeprecatedDimension {
+ extends HasLabel, HasId, HasBinding, HasState,
+ IsGridLayoutComponentWithDeprecatedDimension, IsGridLayoutContainer {
/**
* Contains the id of the component wich should have the focus after
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -25,6 +25,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
/**
* Intended for use in situations when only one UIComponent child can be
@@ -42,5 +43,6 @@
allowedChildComponenents = "org.apache.myfaces.tobago.Reload"),
@Facet(name=Facets.LAYOUT, description = "Contains an instance of UILayout",
allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
-public interface PanelTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent, HasMarkup {
+public interface PanelTagDeclaration
+ extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -24,6 +24,7 @@
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasId;
import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponentWithDeprecatedDimension;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
/**
@@ -35,7 +36,8 @@
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUIPopup",
interfaces = "org.apache.myfaces.tobago.ajax.api.AjaxComponent",
rendererType = RendererTypes.POPUP)
-public interface PopupTagDeclaration extends HasId, IsRendered, IsGridLayoutComponentWithDeprecatedDimension {
+public interface PopupTagDeclaration
+ extends HasId, IsRendered, IsGridLayoutComponentWithDeprecatedDimension, IsGridLayoutContainer {
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "Boolean.TRUE")
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -28,6 +28,7 @@
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
/**
* Render a sheet element.
@@ -45,7 +46,7 @@
"org.apache.myfaces.tobago.ColumnSelector"},
facets = {@Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
-public interface SheetTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent {
+public interface SheetTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer {
/**
* LayoutConstraints for column layout.
* Semicolon separated list of layout tokens ('<x>*', '<x>px' or '<x>%').
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -29,6 +29,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasActionListener;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
import org.apache.myfaces.tobago.taglib.decl.IsImmediateCommand;
/**
@@ -45,7 +46,8 @@
allowedChildComponenents = "org.apache.myfaces.tobago.Tab")
public interface TabGroupTagDeclaration
- extends HasIdBindingAndRendered, IsImmediateCommand, HasAction, HasActionListener, IsGridLayoutComponent {
+ extends HasIdBindingAndRendered, IsImmediateCommand, HasAction, HasActionListener,
+ IsGridLayoutComponent, IsGridLayoutContainer {
/**
* Deprecated! Use 'switchType' instead.
* Flag indicating that tab switching is done by server request.
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/WizardTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/WizardTagDeclaration.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/WizardTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/WizardTagDeclaration.java Tue Nov 17 11:03:47 2009
@@ -26,6 +26,7 @@
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutContainer;
// XXX check if JSP will be supported for the wizard
@@ -38,7 +39,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UIWizard",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUIWizard",
rendererType = RendererTypes.WIZARD)
-public interface WizardTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent {
+public interface WizardTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer {
@TagAttribute(required = true)
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.Wizard",
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java Tue Nov 17 11:03:47 2009
@@ -141,49 +141,4 @@
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Display")
void setDisplay(String display);
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
- * @param leftOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"leftOffset\")")
- void setLeftOffset(String leftOffset);
-
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
- * @param rightOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"rightOffset\")")
- void setRightOffset(String rightOffset);
-
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
- * @param topOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"topOffset\")")
- void setTopOffset(String topOffset);
-
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
- * @param bottomOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"bottomOffset\")")
- void setBottomOffset(String bottomOffset);
-
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponentWithDeprecatedDimension.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponentWithDeprecatedDimension.java?rev=881242&r1=881241&r2=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponentWithDeprecatedDimension.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponentWithDeprecatedDimension.java Tue Nov 17 11:03:47 2009
@@ -152,49 +152,4 @@
*/
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Display")
void setDisplay(String display);
-
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
- * @param leftOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"leftOffset\")")
- void setLeftOffset(String leftOffset);
-
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
- * @param rightOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"rightOffset\")")
- void setRightOffset(String rightOffset);
-
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
- * @param topOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"topOffset\")")
- void setTopOffset(String topOffset);
-
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
- * @param bottomOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"bottomOffset\")")
- void setBottomOffset(String bottomOffset);
-
}
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java (from r880704, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java&r1=880704&r2=881242&rev=881242&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutComponent.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsGridLayoutContainer.java Tue Nov 17 11:03:47 2009
@@ -19,171 +19,47 @@
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-public interface IsGridLayoutComponent {
-
- /**
- * @param columnSpan The number of horizontal cells this component should use.
- */
- @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "1")
- void setColumnSpan(String columnSpan);
-
- /**
- * @param rowSpan The number of vertical cells this component should use.
- */
- @UIComponentTagAttribute(type = "java.lang.Integer", defaultValue = "1")
- void setRowSpan(String rowSpan);
-
- /**
- * This value will usually be set by the layout manager.
- *
- * @param width The width for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + " getRenderer(getFacesContext())).getWidth(getFacesContext(), this)")
- void setWidth(String width);
-
- /**
- * This value will usually be set by the layout manager.
- *
- * @param height The height for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + " getRenderer(getFacesContext())).getHeight(getFacesContext(), this)")
- void setHeight(String height);
-
- /**
- * @param minimumWidth The minimum width for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + " getRenderer(getFacesContext())).getMinimumWidth(getFacesContext(), this)")
- void setMinimumWidth(String minimumWidth);
-
- /**
- * @param minimumHeight The minimum height for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getMinimumHeight(getFacesContext(), this)")
- void setMinimumHeight(String minimumHeight);
-
- /**
- * @param preferredWidth The preferred width for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getPreferredWidth(getFacesContext(), this)")
- void setPreferredWidth(String preferredWidth);
-
- /**
- * @param preferredHeight The preferred height for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getPreferredHeight(getFacesContext(), this)")
- void setPreferredHeight(String preferredHeight);
-
- /**
- * @param maximumWidth The maximum width for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getMaximumWidth(getFacesContext(), this)")
- void setMaximumWidth(String maximumWidth);
-
- /**
- * @param maximumHeight The maximum height for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure",
- defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
- + "getRenderer(getFacesContext())).getMaximumHeight(getFacesContext(), this)")
- void setMaximumHeight(String maximumHeight);
-
- /**
- * This value will usually be set by the layout manager.
- *
- * @param left The left position value for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
- void setLeft(String left);
-
- /**
- * This value will usually be set by the layout manager.
- *
- * @param top The top position value for this component.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
- void setTop(String top);
+public interface IsGridLayoutContainer {
/**
* This attribute is for internal use only.
*
- * @param horizontalIndex The index of the component inside its container grid in horizontal direction.
- */
- @UIComponentTagAttribute(type = "java.lang.Integer")
- void setHorizontalIndex(String horizontalIndex);
-
- /**
- * This attribute is for internal use only.
- *
- * @param verticalIndex The index of the component inside its container grid in vertical direction.
- */
- @UIComponentTagAttribute(type = "java.lang.Integer")
- void setVerticalIndex(String verticalIndex);
-
- /**
- * This attribute is for internal use only.
- *
- * @param display Indicates the renderer to render the element as block or inline.
- */
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Display")
- void setDisplay(String display);
-
- /**
- * This attribute is for internal use only.
- * TODO: this attribute es for containers only
- *
* @param leftOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"leftOffset\")")
+ defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
+ + "getRenderer(getFacesContext())).getLeftOffset(getFacesContext(), this)")
void setLeftOffset(String leftOffset);
/**
* This attribute is for internal use only.
- * TODO: this attribute es for containers only
*
* @param rightOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"rightOffset\")")
+ defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
+ + "getRenderer(getFacesContext())).getRightOffset(getFacesContext(), this)")
void setRightOffset(String rightOffset);
/**
* This attribute is for internal use only.
- * TODO: this attribute es for containers only
*
* @param topOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"topOffset\")")
+ defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
+ + "getRenderer(getFacesContext())).getTopOffset(getFacesContext(), this)")
void setTopOffset(String topOffset);
/**
* This attribute is for internal use only.
- * TODO: this attribute es for containers only
*
* @param bottomOffset 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.config.ThemeConfig.getMeasure("
- + "getFacesContext(), getRendererType(), \"bottomOffset\")")
+ defaultCode = "((org.apache.myfaces.tobago.renderkit.LayoutComponentRenderer)\n"
+ + "getRenderer(getFacesContext())).getBottomOffset(getFacesContext(), this)")
void setBottomOffset(String bottomOffset);
}