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 2008/01/11 18:19:47 UTC
svn commit: r611240 [1/2] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
core/src/main/java/org/apache/myfaces/tobago/taglib/decl/
sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/
tobago-tool/t...
Author: lofwyr
Date: Fri Jan 11 09:19:35 2008
New Revision: 611240
URL: http://svn.apache.org/viewvc?rev=611240&view=rev
Log:
TOBAGO-591: Add informations to the tag declaration interfaces to generate documentation and meta information for faces-config.xml
Modified:
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/ButtonTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.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/InTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.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/ProgressTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.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/TextAreaTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasAction.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasActionListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasMarkup.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasState.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasTreeNodeValue.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValueChangeListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsDisabled.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FacesConfigAnnotationVisitor.java
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=611240&r1=611239&r2=611240&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 Fri Jan 11 09:19:35 2008
@@ -34,8 +34,11 @@
uiComponent = "org.apache.myfaces.tobago.component.UIBox",
rendererType = "Box",
facets = {
- @Facet(name = "toolBar", description = "Contains an instance of UIToolBar"),
- @Facet(name = "layout", description = "Contains an instance of UILayout")})
+ @Facet(name="toolBar", description = "Contains an instance of UIToolBar",
+ allowedChildComponenents = "org.apache.myfaces.tobago.ToolBar"),
+ @Facet(name="layout", description = "Contains an instance of UILayout",
+ allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
+
public interface BoxTagDeclaration extends TobagoBodyTagDeclaration,
HasIdBindingAndRendered, HasDeprecatedDimension, HasLabel {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -47,9 +47,12 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIButtonCommand",
rendererType = "Button",
+ allowedChildComponenents = "NONE",
facets = {
- @Facet(name = "confirmation", description = "Contains a UIOutput instance with the confirmation message."),
- @Facet(name = "popup", description = "Contains a UIPopup instance.")})
+ @Facet(name="confirmation", description = "Contains a UIOutput instance with the confirmation message.",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Output"),
+ @Facet(name="popup", description = "Contains a UIPopup instance.",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Popup")})
public interface ButtonTagDeclaration extends AbstractCommandTagDeclaration,
HasIdBindingAndRendered, HasLabelAndAccessKey, HasImage,
IsDisabled, HasCommandType, IsDefaultCommand, HasDeprecatedWidth, HasTip,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -35,6 +35,7 @@
@Tag(name = "columnSelector", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumnSelector",
- rendererType = "ColumnSelector")
+ rendererType = "ColumnSelector",
+ allowedChildComponenents = "NONE")
public interface ColumnSelectorTagDeclaration extends TobagoTagDeclaration, IsDisabled, IsRendered, HasBinding {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -32,7 +32,8 @@
*/
@Tag(name = "command", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UICommand",
- rendererType = "Command")
+ rendererType = "Command",
+ allowedChildComponenents = "NONE")
public interface CommandTagDeclaration extends AbstractCommandTagDeclaration, HasId {
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DatePickerTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -37,7 +37,8 @@
@Tag(name = "datePicker")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIDatePicker",
- rendererType = RENDERER_TYPE_DATE_PICKER)
+ rendererType = RENDERER_TYPE_DATE_PICKER,
+ allowedChildComponenents = "NONE")
public interface DatePickerTagDeclaration extends TobagoTagDeclaration, HasFor,
HasTabIndex {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -42,7 +42,8 @@
@Tag(name = "date")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIDateInput",
- rendererType = RENDERER_TYPE_DATE)
+ rendererType = RENDERER_TYPE_DATE,
+ allowedChildComponenents = "NONE")
public interface DateTagDeclaration
extends InputTagDeclaration, HasIdBindingAndRendered, IsReadonly,
IsDisabled, HasConverter, IsInline, IsFocus, HasLabelAndAccessKey,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -47,7 +47,8 @@
@Tag(name = "file")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIFileInput",
- rendererType = "File")
+ rendererType = "File",
+ allowedChildComponenents = "NONE")
public interface FileTagDeclaration
extends BeanTagDeclaration, HasValidator, HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, IsDisabled,
HasLabelAndAccessKey, HasTip, IsReadonly, IsRequired, HasTabIndex {
@@ -58,6 +59,6 @@
* uploaded file.
*/
@TagAttribute()
- @UIComponentTagAttribute(type = {"org.apache.commons.fileupload.FileItem"})
+ @UIComponentTagAttribute(type = { "org.apache.commons.fileupload.FileItem" }, valueExpression = "REQUIRED")
void setValue(String value);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -29,7 +29,8 @@
@Tag(name = "form")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIForm",
- rendererType = "Form")
+ rendererType = "Form",
+ allowedChildComponenents = "ALL")
public interface FormTagDeclaration extends TobagoBodyTagDeclaration,
HasBinding, HasId {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -94,7 +94,8 @@
@Tag(name = "gridLayout", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIGridLayout",
- rendererType = "GridLayout")
+ rendererType = "GridLayout",
+ allowedChildComponenents = "NONE")
public interface GridLayoutTagDeclaration extends TobagoTagDeclaration, HasId, HasBorder, HasCellspacing, HasMargin,
HasMargins, HasColumnLayout, HasRowLayout, HasBinding {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -37,7 +37,8 @@
@Tag(name = "hidden")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIHiddenInput",
- rendererType = "Hidden")
+ rendererType = "Hidden",
+ allowedChildComponenents = "NONE")
public interface HiddenTagDeclaration extends BeanTagDeclaration, HasId, HasBinding, HasValue, HasConverter,
HasValidator {
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=611240&r1=611239&r2=611240&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 Fri Jan 11 09:19:35 2008
@@ -35,10 +35,11 @@
/**
* Renders a Image.
*/
-@Tag(name = "image", bodyContent = BodyContent.EMPTY)
+@Tag(name = "image", bodyContent = BodyContent.JSP)
@UIComponentTag(
uiComponent = "javax.faces.component.UIGraphic",
- rendererType = "Image", isComponentAlreadyDefined = true)
+ rendererType = "Image", isComponentAlreadyDefined = false, // changed to false
+ allowedChildComponenents = "NONE")
public interface ImageTagDeclaration extends TobagoTagDeclaration,
HasIdBindingAndRendered, HasBorder, HasDimension, HasTip {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -47,7 +47,8 @@
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIInput",
- rendererType = "In")
+ rendererType = "In",
+ allowedChildComponenents = "NONE")
public interface InTagDeclaration
extends TextInputTagDeclaration, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasDeprecatedWidth,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -42,7 +42,8 @@
@Tag(name = "label", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILabel",
- rendererType = "Label")
+ rendererType = "Label",
+ allowedChildComponenents = "NONE")
public interface LabelTagDeclaration extends BeanTagDeclaration, HasIdBindingAndRendered,
HasLabelWithAccessKey, HasFor, IsInline, HasDeprecatedWidth, HasTip, HasMarkup {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -45,8 +45,9 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILinkCommand",
rendererType = "Link",
- facets = {@Facet(name = "confirmation",
- description = "Contains a UIOutput instance with the confirmation message.")})
+ allowedChildComponenents = "NONE",
+ facets = {@Facet(name="confirmation", description = "Contains a UIOutput instance with the confirmation message.",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Output")})
public interface LinkTagDeclaration extends AbstractCommandTagDeclaration,
HasIdBindingAndRendered, HasLabelAndAccessKey, IsDisabled, IsInline,
HasCommandType, HasTarget, HasTip, HasImage, HasMarkup, HasTabIndex {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -42,6 +42,11 @@
"org.apache.myfaces.tobago.taglib.component.MenuSeparatorTag"})
@UIComponentTag(
uiComponent = "javax.faces.component.UIPanel",
- rendererType = "MenuBar", isComponentAlreadyDefined = true)
+ rendererType = "MenuBar", isComponentAlreadyDefined = false, // changed to false
+ allowedChildComponenents = "org.apache.myfaces.tobago.Menu " +
+ "org.apache.myfaces.tobago.MenuCommand " +
+ "org.apache.myfaces.tobago.SelectBooleanCommand " +
+ "org.apache.myfaces.tobago.MenuSelectOne " +
+ "org.apache.myfaces.tobago.MenuSeparator")
public interface MenuBarTagDeclaration extends TobagoBodyTagDeclaration, HasIdBindingAndRendered, HasDeprecatedWidth {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -36,7 +36,8 @@
@Tag(name = "menuCheckbox", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
- rendererType = "MenuCommand")
+ rendererType = "MenuCommand",
+ allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems")
public interface MenuCheckboxTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
HasIdBindingAndRendered, IsDisabled, HasCommandType, HasBooleanValue,
HasLabelAndAccessKey {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -36,7 +36,8 @@
@Tag(name = "menuItem", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenuCommand",
- rendererType = "MenuCommand")
+ rendererType = "MenuCommand",
+ allowedChildComponenents = "NONE")
public interface MenuCommandTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
HasIdBindingAndRendered, HasLabelAndAccessKey, IsDisabled, HasCommandType, HasImage, HasTarget {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -35,7 +35,8 @@
@Tag(name = "menuRadio", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOneCommand",
- rendererType = "MenuCommand")
+ rendererType = "MenuCommand",
+ allowedChildComponenents = "NONE")
public interface MenuRadioTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
HasIdBindingAndRendered, HasLabel, IsDisabled, HasCommandType, HasValue {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -37,7 +37,8 @@
@Tag(name = "menucheck", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
- rendererType = "MenuCommand")
+ rendererType = "MenuCommand",
+ allowedChildComponenents = "NONE")
@Deprecated
public interface MenuSelectBooleanTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
HasIdBindingAndRendered, IsDisabled, HasCommandType,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -36,7 +36,8 @@
@Tag(name = "menuradio", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOneCommand",
- rendererType = "MenuCommand")
+ rendererType = "MenuCommand",
+ allowedChildComponenents = "NONE")
@Deprecated
public interface MenuSelectOneTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
HasIdBindingAndRendered, HasLabel, IsDisabled, HasCommandType, HasValue {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -33,7 +33,8 @@
*/
@Tag(name = "menuSeparator", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UIMenuSeparator")
+ uiComponent = "org.apache.myfaces.tobago.component.UIMenuSeparator",
+ allowedChildComponenents = "NONE")
public interface MenuSeparatorTagDeclaration extends TobagoTagDeclaration, IsRendered, HasBinding {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -41,7 +41,12 @@
"org.apache.myfaces.tobago.taglib.component.MenuSelectOneTag",
"org.apache.myfaces.tobago.taglib.component.MenuSeparatorTag"})
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UIMenu")
+ uiComponent = "org.apache.myfaces.tobago.component.UIMenu",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Menu " +
+ "org.apache.myfaces.tobago.MenuCommand " +
+ "org.apache.myfaces.tobago.SelectBooleanCommand " +
+ "org.apache.myfaces.tobago.MenuSelectOne " +
+ "org.apache.myfaces.tobago.MenuSeparator")
public interface MenuTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasLabelAndAccessKey,
IsDisabled, HasImage {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -39,7 +39,8 @@
@Tag(name = "message", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "javax.faces.component.UIMessage",
- rendererType = "Message", isComponentAlreadyDefined = true)
+ rendererType = "Message", isComponentAlreadyDefined = false,
+ allowedChildComponenents = "NONE")
public interface MessageTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasFor {
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -37,7 +37,8 @@
@Tag(name = "messages", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMessages",
- rendererType = "Messages")
+ rendererType = "Messages",
+ allowedChildComponenents = "NONE")
public interface MessagesTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasFor {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -31,7 +31,8 @@
@Tag(name = "object", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "javax.faces.component.UIOutput",
- rendererType = "Object", isComponentAlreadyDefined = true)
+ rendererType = "Object", isComponentAlreadyDefined = false,
+ allowedChildComponenents = "NONE")
public interface ObjectTagDeclaration extends TobagoTagDeclaration, HasId {
/**
* URI to object source
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -41,7 +41,8 @@
@BodyContentDescription(anyTagOf = "f:converter|f:convertNumber|f:convertDateTime|...")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIOutput",
- rendererType = "Out")
+ rendererType = "Out",
+ allowedChildComponenents = "NONE")
public interface OutTagDeclaration extends
BeanTagDeclaration, HasIdBindingAndRendered, HasConverter, IsInline, HasTip, HasValue {
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=611240&r1=611239&r2=611240&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 Fri Jan 11 09:19:35 2008
@@ -40,9 +40,12 @@
uiComponent = "org.apache.myfaces.tobago.component.UIPage",
rendererType = "Page",
facets =
- {@Facet(name = "action", description = "Contains an instance of UICommand (tc:command) for an auto-action"),
- @Facet(name = "menuBar", description = "Menubar"),
- @Facet(name = "layout", description = "Contains an instance of UILayout")})
+ { @Facet(name = "action", description ="Contains an instance of UICommand (tc:command) for an auto-action",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+ @Facet(name = "menuBar", description = "Menubar",
+ allowedChildComponenents = "javax.faces.component.UIPanel"), //fake
+ @Facet(name="layout", description = "Contains an instance of UILayout",
+ allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
public interface PageTagDeclaration extends TobagoBodyTagDeclaration, HasLabel, HasId, HasDimension, HasBinding,
HasState {
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=611240&r1=611239&r2=611240&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 Fri Jan 11 09:19:35 2008
@@ -38,8 +38,10 @@
uiComponent = "org.apache.myfaces.tobago.component.UIPanel",
rendererType = "Panel",
facets = {
- @Facet(name = "reload", description = "Contains an instance of UIReload"),
- @Facet(name = "layout", description = "Contains an instance of UILayout")})
+ @Facet(name="reload", description = "Contains an instance of UIReload",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Reload"),
+ @Facet(name="layout", description = "Contains an instance of UILayout",
+ allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
public interface PanelTagDeclaration extends TobagoBodyTagDeclaration,
HasIdBindingAndRendered, HasDeprecatedDimension {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -38,16 +38,19 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIProgress",
rendererType = "Progress",
+ allowedChildComponenents = "NONE",
facets = {@Facet(
- name = "complete",
+ name="complete",
description =
- "Contains an instance of UICommand (tc:command). The action is invoked if the full progress has reached")})
+ "Contains an instance of UICommand (tc:command). The action is invoked if the full progress has reached",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")})
+
public interface ProgressTagDeclaration extends BeanTagDeclaration, HasIdBindingAndRendered, HasTip, HasMarkup {
/**
* The current value of this component.
*/
@TagAttribute
- @UIComponentTagAttribute(type = {"javax.swing.BoundedRangeModel"})
+ @UIComponentTagAttribute(type = { "javax.swing.BoundedRangeModel" }, valueExpression = "REQUIRED")
void setValue(String value);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -34,7 +34,8 @@
@Tag(name = "reload")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UIReload")
+ uiComponent = "org.apache.myfaces.tobago.component.UIReload",
+ allowedChildComponenents = "NONE")
public interface ReloadTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -47,13 +47,16 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBoolean",
rendererType = "SelectBooleanCheckbox",
+ allowedChildComponenents = "NONE",
facets = {
- @Facet(name = "click",
- description =
- "This facet can contain a UICommand that is invoked in case of a click event from the component"),
- @Facet(name = "change",
- description =
- "This facet can contain a UICommand that is invoked in case of a change event from the component")
+ @Facet(name = "click",
+ description =
+ "This facet can contain a UICommand that is invoked in case of a click event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
+ @Facet(name = "change",
+ description =
+ "This facet can contain a UICommand that is invoked in case of a change event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
})
public interface SelectBooleanCheckboxTagDeclaration extends BeanTagDeclaration, HasValidator,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -37,7 +37,9 @@
* action.
*/
@Tag(name = "selectItem", bodyContent = BodyContent.EMPTY)
-@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UISelectItem")
+@UIComponentTag(
+ uiComponent = "org.apache.myfaces.tobago.component.UISelectItem",
+ allowedChildComponenents = "NONE")
public interface SelectItemTagDeclaration extends TobagoTagDeclaration, HasBinding, HasId, HasMarkup {
/**
* Flag indicating whether the option created
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -31,7 +31,10 @@
* action.
*/
@Tag(name = "selectItems", bodyContent = BodyContent.EMPTY)
-@UIComponentTag(uiComponent = "javax.faces.component.UISelectItems", isComponentAlreadyDefined = true)
+@UIComponentTag(
+ uiComponent = "javax.faces.component.UISelectItems",
+ isComponentAlreadyDefined = false,
+ allowedChildComponenents = "NONE")
public interface SelectItemsTagDeclaration extends TobagoTagDeclaration, HasId, HasBinding {
/**
@@ -39,7 +42,7 @@
* the information for this option.
*/
@TagAttribute
- @UIComponentTagAttribute()
+ @UIComponentTagAttribute(valueExpression = "REQUIRED")
void setValue(String value);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -43,7 +43,8 @@
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectMany",
- rendererType = "SelectManyCheckbox")
+ rendererType = "SelectManyCheckbox",
+ allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems")
public interface SelectManyCheckboxTagDeclaration extends
SelectManyTagDeclaration, IsDisabled, HasId,
IsInline, HasRenderRange, IsRendered, IsRequired, HasBinding, IsReadonly, HasConverter {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -41,7 +41,8 @@
@Tag(name = "selectManyListbox")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectMany",
- rendererType = "SelectManyListbox")
+ rendererType = "SelectManyListbox",
+ allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems")
public interface SelectManyListboxTagDeclaration
extends SelectManyTagDeclaration, HasId, IsDisabled,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -47,13 +47,16 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneChoice",
+ allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems",
facets = {
@Facet(name = "click",
description =
- "This facet can contain a UICommand that is invoked in case of a click event from the component"),
+ "This facet can contain a UICommand that is invoked in case of a click event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
@Facet(name = "change",
description =
- "This facet can contain a UICommand that is invoked in case of a change event from the component")
+ "This facet can contain a UICommand that is invoked in case of a change event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
})
public interface SelectOneChoiceTagDeclaration
extends SelectOneTagDeclaration, HasId, IsDisabled,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -45,13 +45,16 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneListbox",
+ allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems",
facets = {
@Facet(name = "click",
description =
- "This facet can contain a UICommand that is invoked in case of a click event from the component"),
+ "This facet can contain a UICommand that is invoked in case of a click event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
@Facet(name = "change",
description =
- "This facet can contain a UICommand that is invoked in case of a change event from the component")
+ "This facet can contain a UICommand that is invoked in case of a change event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
})
public interface SelectOneListboxTagDeclaration extends SelectOneTagDeclaration, HasId, IsDisabled,
IsReadonly, HasLabelAndAccessKey, IsRendered, HasBinding, HasDeprecatedHeight, HasTip {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -44,13 +44,16 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneRadio",
+ allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems",
facets = {
@Facet(name = "click",
description =
- "This facet can contain a UICommand that is invoked in case of a click event from the component"),
+ "This facet can contain a UICommand that is invoked in case of a click event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
@Facet(name = "change",
description =
- "This facet can contain a UICommand that is invoked in case of a change event from the component")
+ "This facet can contain a UICommand that is invoked in case of a change event from the component",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
})
public interface SelectOneRadioTagDeclaration extends SelectOneTagDeclaration, IsDisabled, HasId,
IsInline, HasRenderRange, IsRendered, HasBinding, HasConverter {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -36,7 +36,9 @@
@Tag(name = "selectReference", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "javax.faces.component.UIOutput",
- rendererType = "SelectReference", isComponentAlreadyDefined = true)
+ rendererType = "SelectReference",
+ isComponentAlreadyDefined = false,
+ allowedChildComponenents = "NONE")
public interface SelectReferenceTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered {
/**
* Id of the component, this is related to.
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -28,7 +28,9 @@
@Tag(name = "separator")
@UIComponentTag(rendererType = "Separator",
uiComponent = "org.apache.myfaces.tobago.component.UISeparator",
- facets = {@Facet(name = "label", description = "This facet contains a UILabel")})
+ allowedChildComponenents = "NONE",
+ facets = { @Facet(name = "label", description = "This facet contains a UILabel",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Label") })
public interface SeparatorTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered {
}
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=611240&r1=611239&r2=611240&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 Fri Jan 11 09:19:35 2008
@@ -28,6 +28,8 @@
import org.apache.myfaces.tobago.component.UIData;
/*
+ * Created by IntelliJ IDEA.
+ * User: bommel
* Date: 08.04.2006
* Time: 15:30:50
*/
@@ -40,7 +42,9 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIData",
rendererType = "Sheet",
- facets = {@Facet(name = "reload", description = "Contains an instance of UIReload")})
+ allowedChildComponenents = "javax.faces.Column org.apache.myfaces.tobago.ColumnSelector",
+ facets = {@Facet(name="reload", description = "Contains an instance of UIReload",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
public interface SheetTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered {
/**
@@ -97,7 +101,8 @@
*/
@TagAttribute
@UIComponentTagAttribute(type = {"java.lang.Object[]", "java.util.List", "javax.servlet.jsp.jstl.sql.Result",
- "java.sql.ResultSet", "java.lang.Object", "javax.faces.model.DataModel"})
+ "java.sql.ResultSet", "java.lang.Object", "javax.faces.model.DataModel"},
+ valueExpression = "REQUIRED")
void setValue(String value);
/**
@@ -185,18 +190,18 @@
* Sheet state saving object.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.SheetState")
+ @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.SheetState", valueExpression = "REQUIRED")
void setState(String state);
/**
* Method binding representing a stateChangeListener method that will be
* notified when the state was changed by the user.
- * The expression must evaluate to a public method that takes a
- * SheetStateChangeEvent parameter, with a return type of void.
+ * The expression must evaluate to a public method that takes a
+ * SheetStateChangeEvent parameter, with a return type of void.
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.el.MethodBinding",
- expression = DynamicExpression.METHOD_BINDING)
+ expression = DynamicExpression.METHOD_BINDING, valueExpression = "REQUIRED")
void setStateChangeListener(String stateChangeListener);
/**
@@ -213,7 +218,7 @@
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.el.MethodBinding",
- expression = DynamicExpression.METHOD_BINDING)
+ expression = DynamicExpression.METHOD_BINDING, valueExpression = "REQUIRED")
void setSortActionListener(String sortActionListener);
}
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=611240&r1=611239&r2=611240&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 Fri Jan 11 09:19:35 2008
@@ -28,6 +28,8 @@
import org.apache.myfaces.tobago.taglib.decl.IsImmediateCommand;
/*
+ * Created by IntelliJ IDEA.
+ * User: bommel
* Date: 08.04.2006
* Time: 14:53:06
*/
@@ -39,14 +41,14 @@
@BodyContentDescription(anyTagOf = "(<tc:tab>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITabGroup",
- rendererType = "TabGroup")
+ rendererType = "TabGroup",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Tab")
public interface TabGroupTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasDeprecatedDimension,
IsImmediateCommand {
/**
* Deprecated! Use 'switchType' instead.
* Flag indicating that tab switching is done by server request.
- *
* @deprecated
*/
@TagAttribute
@@ -56,11 +58,11 @@
/**
* Flag indicating how tab switching should be done.
- * <p/>
+ *
* Possible values are:
- * "client" : Tab switching id done on client, no server Request. This is default.
- * "reloadPage" : Tab switching id done by server request. Full page is reloaded.
- * "reloadTab" : Tab switching id done by server request. Only the Tab is reloaded.
+ * "client" : Tab switching id done on client, no server Request. This is default.
+ * "reloadPage" : Tab switching id done by server request. Full page is reloaded.
+ * "reloadTab" : Tab switching id done by server request. Only the Tab is reloaded.
*/
@TagAttribute
@UIComponentTagAttribute(type = "java.lang.String",
@@ -70,14 +72,16 @@
void setSwitchType(String switchType);
/**
+ *
* <strong>ValueBindingExpression</strong> pointing to a Integer to save the
* component's selected Tab.
+ *
*/
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.Integer")
+ @TagAttribute @UIComponentTagAttribute(type = "java.lang.Integer", valueExpression= "REQUIRED")
void setSelectedIndex(String selectedIndex);
/**
+ *
* <strong>ValueBindingExpression</strong> pointing to a Integer to save the
* component's selected Tab.
*/
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -43,7 +43,8 @@
@Tag(name = "textarea")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIInput",
- rendererType = "TextArea")
+ rendererType = "TextArea",
+ allowedChildComponenents = "NONE")
public interface TextAreaTagDeclaration extends TextInputTagDeclaration, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasDeprecatedDimension,
IsFocus, IsRequired, HasLabelAndAccessKey, HasTip {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -39,7 +39,8 @@
@Tag(name = "time")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITimeInput",
- rendererType = RENDERER_TYPE_TIME)
+ rendererType =RENDERER_TYPE_TIME,
+ allowedChildComponenents = "NONE")
public interface TimeTagDeclaration
extends InputTagDeclaration, HasIdBindingAndRendered,
IsReadonly, IsDisabled, IsInline, HasLabelAndAccessKey, HasTip, IsRequired {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarCommandTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -37,7 +37,8 @@
@Tag(name = "toolBarCommand", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UICommand",
- rendererType = "Button")
+ rendererType = "Button",
+ allowedChildComponenents = "NONE")
public interface ToolBarCommandTagDeclaration extends AbstractCommandTagDeclaration, HasIdBindingAndRendered,
HasLabelAndAccessKey, HasImage, IsDisabled, HasCommandType, HasTip {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectBooleanTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -38,7 +38,8 @@
@Tag(name = "toolBarCheck", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
- rendererType = "MenuCommand")
+ rendererType = "MenuCommand",
+ allowedChildComponenents = "NONE")
public interface ToolBarSelectBooleanTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
HasIdBindingAndRendered, HasLabelAndAccessKey,
HasCommandType, HasImage, IsDisabled, HasBooleanValue,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarSelectOneTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -36,7 +36,8 @@
tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOneCommand",
- rendererType = "MenuCommand")
+ rendererType = "MenuCommand",
+ allowedChildComponenents = "NONE")
public interface ToolBarSelectOneTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
HasIdBindingAndRendered, IsDisabled, HasCommandType, HasValue {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -59,7 +59,10 @@
@BodyContentDescription(anyTagOf = "(<tc:toolBarCommand>|<tc:toolBarSelectBoolean>|<tc:toolBarSelectOne>)* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIToolBar",
- rendererType = "ToolBar")
+ rendererType = "ToolBar",
+ allowedChildComponenents = "org.apache.myfaces.tobago.SelectOneCommand " +
+ "org.apache.myfaces.tobago.SelectBooleanCommand " +
+ "org.apache.myfaces.tobago.Command")
public interface ToolBarTagDeclaration extends PanelTagDeclaration {
/**
* Position of the button label, possible values are: right, bottom, off.
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasAction.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasAction.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasAction.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasAction.java Fri Jan 11 09:19:35 2008
@@ -35,7 +35,9 @@
* The String is directly passed to the Navigationhandler.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.el.MethodBinding", expression = DynamicExpression.METHOD_BINDING)
+ @UIComponentTagAttribute(
+ type = "javax.faces.el.MethodBinding",
+ expression = DynamicExpression.METHOD_BINDING)
void setAction(String action);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasActionListener.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasActionListener.java Fri Jan 11 09:19:35 2008
@@ -32,6 +32,9 @@
* parameter, with a return type of void.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.el.MethodBinding", expression = DynamicExpression.METHOD_BINDING)
+ @UIComponentTagAttribute(
+ type = "javax.faces.el.MethodBinding",
+ expression = DynamicExpression.METHOD_BINDING,
+ valueExpression = "REQUIRED")
void setActionListener(String actionListener);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java Fri Jan 11 09:19:35 2008
@@ -25,9 +25,8 @@
*/
public interface HasHeight {
/**
- * The height for this component.
+ * The height for this component.
*/
- @TagAttribute
- @UIComponentTagAttribute()
+ @TagAttribute @UIComponentTagAttribute(type = "java.lang.Integer")
void setHeight(String height);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasMarkup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasMarkup.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasMarkup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasMarkup.java Fri Jan 11 09:19:35 2008
@@ -31,6 +31,6 @@
* Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
- @UIComponentTagAttribute(defaultValue = "none")
+ @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
void setMarkup(String markup);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasState.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasState.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasState.java Fri Jan 11 09:19:35 2008
@@ -25,11 +25,14 @@
*/
public interface HasState {
/**
+ *
* <strong>ValueBindingExpression</strong> pointing to a object to save the
* component's state.
+ *
*/
// TODO is Object right
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.Object")
+ @TagAttribute @UIComponentTagAttribute(
+ type = "java.lang.Object",
+ valueExpression = "REQUIRED")
void setState(String state);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasTreeNodeValue.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasTreeNodeValue.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasTreeNodeValue.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasTreeNodeValue.java Fri Jan 11 09:19:35 2008
@@ -32,6 +32,8 @@
* A javax.swing.tree.TreeNode object to use as rootNode in the tree.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.swing.tree.TreeNode")
+ @UIComponentTagAttribute(
+ type = "javax.swing.tree.TreeNode",
+ valueExpression = "REQUIRED")
void setValue(String value);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValueChangeListener.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValueChangeListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValueChangeListener.java Fri Jan 11 09:19:35 2008
@@ -35,6 +35,9 @@
* @param valueChangeListener
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.el.MethodBinding", expression = DynamicExpression.METHOD_BINDING)
+ @UIComponentTagAttribute(
+ type = "javax.faces.el.MethodBinding",
+ expression = DynamicExpression.METHOD_BINDING,
+ valueExpression = "REQUIRED")
void setValueChangeListener(String valueChangeListener);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java Fri Jan 11 09:19:35 2008
@@ -25,11 +25,8 @@
*/
public interface HasWidth {
/**
- * The width for this component.
- * This value is used in the gridLayouts columns attribute.
- * See gridLayout tag for valid values.
+ * The width for this component.
*/
- @TagAttribute
- @UIComponentTagAttribute()
+ @TagAttribute @UIComponentTagAttribute(type = "java.lang.Integer")
void setWidth(String width);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsDisabled.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsDisabled.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsDisabled.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsDisabled.java Fri Jan 11 09:19:35 2008
@@ -30,6 +30,6 @@
* Flag indicating that this element is disabled.
*/
@TagAttribute(type = String.class)
- @UIComponentTagAttribute(type = "java.lang.Boolean")
+ @UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "false")
void setDisabled(String disabled);
}
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -32,7 +32,8 @@
@BodyContentDescription(anyTagOf = "<tcs:treeNode>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeData",
- rendererType = "TreeData")
+ rendererType = "TreeData",
+ allowedChildComponenents = "org.apache.myfaces.tobago.TreeNode")
public interface TreeDataTagDeclaration extends TobagoTagDeclaration,
HasIdBindingAndRendered, HasTreeNodeValue, HasVar {
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -42,8 +42,10 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
rendererType = "TreeNode",
+ allowedChildComponenents = "org.apache.myfaces.tobago.TreeNode " +
+ "org.apache.myfaces.tobago.TreeData",
facets = {
- @Facet(name = "addendum", description = "Displays an additional component to a node.")})
+ @Facet(name = "addendum", description = "Displays an additional component to a node.")})
public interface TreeNodeTagDeclaration
extends HasIdBindingAndRendered, HasLabel, HasValue, HasMarkup, AbstractCommandTagDeclaration, HasTip, HasTarget,
HasImage, IsDisabled {
@@ -52,13 +54,13 @@
* Flag indicating if the subnodes are to be displayed.
*/
@TagAttribute(type = String.class)
- @UIComponentTagAttribute(type = "java.lang.Boolean")
+ @UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "true")
void setExpanded(String expanded);
/**
* Flag indicating if the node is marked, and should be displayed in a special way.
*/
@TagAttribute(type = String.class)
- @UIComponentTagAttribute(type = "java.lang.Boolean")
+ @UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "false")
void setMarked(String marked);
}
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java Fri Jan 11 09:19:35 2008
@@ -36,8 +36,10 @@
@BodyContentDescription(anyTagOf = "<tcs:treeNode>|<tcs:treeData>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITree",
- rendererType = "Tree")
-public interface TreeTagDeclaration
+ rendererType = "Tree",
+ allowedChildComponenents = "org.apache.myfaces.tobago.TreeNode " +
+ "org.apache.myfaces.tobago.TreeData")
+public interface TreeTagDeclaration
extends TobagoTagDeclaration, HasIdBindingAndRendered, HasTreeNodeValue, IsRequired {
/**
@@ -77,13 +79,13 @@
@UIComponentTagAttribute(type = "java.lang.Boolean",
defaultValue = "false")
void setShowRoot(String showRoot);
-
+
/**
* Display option: Normal tree or menu.
*/
@TagAttribute
@UIComponentTagAttribute(defaultValue = "tree",
- allowedValues = {"tree", "menu"})
+ allowedValues = {"tree", "menu"})
void setMode(String mode);
}
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java?rev=611240&r1=611239&r2=611240&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTagAttribute.java Fri Jan 11 09:19:35 2008
@@ -43,6 +43,8 @@
String defaultValue() default "";
String displayName() default "";
+
+ String valueExpression() default "ALLOWED";
/**
* Specifies whether this property should be visible