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 2013/02/08 15:58:07 UTC
svn commit: r1444036 [1/2] - in
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib:
component/ declaration/
Author: lofwyr
Date: Fri Feb 8 14:58:05 2013
New Revision: 1444036
URL: http://svn.apache.org/r1444036
Log:
splitting commit in parts, because of timeout
2/2
TOBAGO-1212: Using JSR 269: Pluggable Annotation Processing API
- Using new API to generate the sources
- Remove some deprecated stuff
- Class hierarchy sightly changed
- Change the behaviour of generating getter/setter in the UIComponents:
- default is now, that JSF getter/setter will not be overwritten, but Tobago getter/setter will be: @UIComponentTag.uiComponentFacesClass()
- there is a property in the annotation @UIComponentTagAttribute to change the default: generate()
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessageForSelect.java
- copied, changed from r1433377, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessage.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequiredForSelect.java
- copied, changed from r1433377, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRequired.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuItemTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/NamingContainerDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneCommandTagDeclaration.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnEventTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetLayoutTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetPageCommandTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupLayoutTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupToolBarTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TimeTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectBooleanTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectOneTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSeparatorTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeCommandTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIndentTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxNodeTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuCommandTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuLabelTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuNodeTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeMenuTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/WizardTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverter.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasConverterMessage.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasRequiredMessage.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidatorMessage.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValue.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasVar.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsImmediateCommand.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsRendered.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -33,6 +33,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIPanel;
+
/**
* Renders a panel with border and title.
*/
@@ -40,6 +42,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIBox",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIBox",
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
+ componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.BOX,
facets = {
@Facet(name = Facets.TOOL_BAR, description = "Contains an instance of UIToolBar",
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxToolBarTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -22,9 +22,13 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.component.RendererTypes;
+import javax.faces.component.UIPanel;
+
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIToolBar",
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
generate = false,
+ componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.BOX_TOOL_BAR,
allowedChildComponenents = {
"org.apache.myfaces.tobago.SelectOneCommand",
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -35,9 +35,11 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDefaultCommand;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
+
+import javax.faces.component.UICommand;
/**
* Renders a button element.
@@ -46,7 +48,9 @@ import org.apache.myfaces.tobago.interna
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIButton",
- uiComponentBaseClass = "org.apache.myfaces.tobago.component.UICommand",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommand",
+ uiComponentFacesClass = "javax.faces.component.UICommand",
+ componentFamily = UICommand.COMPONENT_FAMILY,
rendererType = RendererTypes.BUTTON,
allowedChildComponenents = "NONE",
facets = {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -31,6 +31,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UIOutput;
+
/**
* Renders a calendar.
*/
@@ -38,7 +40,9 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UICalendar",
uiComponentBaseClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "javax.faces.component.UIOutput",
interfaces = "org.apache.myfaces.tobago.layout.LayoutComponent",
+ componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.CALENDAR)
public interface CalendarTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, HasMarkup, HasCurrentMarkup {
@@ -47,7 +51,8 @@ public interface CalendarTagDeclaration
* The current value of this component.
*/
@TagAttribute
- @UIComponentTagAttribute(type = {"java.util.Calendar", "java.util.Date"},
+ @UIComponentTagAttribute(
+ type = {"java.util.Calendar", "java.util.Date"},
expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CellTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -30,6 +30,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIPanel;
+
/**
* Renders a panel-like layout element with the ability to span over more than
* one layout cell. A cell may only contain one child.
@@ -40,15 +42,19 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UICell",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICell",
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
+ componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.CELL)
public interface CellTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup {
- @UIComponentTagAttribute(type = {"java.lang.Integer"},
+ @UIComponentTagAttribute(
+ type = {"java.lang.Integer"},
defaultValue = "1")
void setColumnSpan(String columnSpan);
- @UIComponentTagAttribute(type = {"java.lang.Integer"},
+ @UIComponentTagAttribute(
+ type = {"java.lang.Integer"},
defaultValue = "1")
void setRowSpan(String rowSpan);
@@ -56,16 +62,20 @@ public interface CellTagDeclaration
* Count of layout columns to span over.
*/
@TagAttribute
- @UIComponentTagAttribute(type = {"java.lang.Integer"},
- defaultValue = "1")
+ @UIComponentTagAttribute(
+ type = {"java.lang.Integer"},
+ defaultValue = "1",
+ generate = false)
void setSpanX(String spanX);
/**
* Count of layout rows to span over.
*/
@TagAttribute
- @UIComponentTagAttribute(type = {"java.lang.Integer"},
- defaultValue = "1")
+ @UIComponentTagAttribute(
+ type = {"java.lang.Integer"},
+ defaultValue = "1",
+ generate = false)
void setSpanY(String spanY);
/**
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnEventTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnEventTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnEventTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnEventTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -29,8 +29,10 @@ import org.apache.myfaces.tobago.interna
* This component creates an event in a UISheet for each row.
*/
@Tag(name = "columnEvent")
-@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UIColumnEvent",
+@UIComponentTag(
+ uiComponent = "org.apache.myfaces.tobago.component.UIColumnEvent",
uiComponentBaseClass = "javax.faces.component.UIColumn",
+ uiComponentFacesClass = "javax.faces.component.UIColumn",
interfaces = "org.apache.myfaces.tobago.component.ColumnEvent")
public interface ColumnEventTagDeclaration extends HasIdBindingAndRendered {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -34,6 +34,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIColumn;
+
/**
* Creates a tree node inside of a sheet (also known as tree table).
* This component represents a single node inside a tree structure.
@@ -44,6 +46,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumnNode",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIColumnNode",
+ uiComponentFacesClass = "javax.faces.component.UIColumn",
+ componentFamily = UIColumn.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE_NODE,
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeIndent",
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -29,6 +29,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
+import javax.faces.component.UIColumn;
+
/**
* Renders a column with checkboxes to mark selected rows.
*/
@@ -36,6 +38,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumnSelector",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIColumnSelector",
+ uiComponentFacesClass = "javax.faces.component.UIColumn",
+ componentFamily = UIColumn.COMPONENT_FAMILY,
rendererType = RendererTypes.COLUMN_SELECTOR,
allowedChildComponenents = "NONE")
public interface ColumnSelectorTagDeclaration
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -33,6 +33,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIColumn;
+
/**
* Renders a UIComponent that represents a single column of data within a
* parent UISheet component.
@@ -41,6 +43,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumn",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIColumn",
+ uiComponentFacesClass = "javax.faces.component.UIColumn",
+ componentFamily = UIColumn.COMPONENT_FAMILY,
rendererType = RendererTypes.COLUMN,
facets = {
@Facet(name = Facets.DROP_DOWN_MENU, description = "Contains a UIMenu instance to render a drop down menu."
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -30,6 +30,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UICommand;
+
/**
* Use this tag only as a facet for click, change in selectOneRadio,
* selectBooleanCheckbox, selectManyCheckbox and selectOneChoice
@@ -39,6 +41,8 @@ import org.apache.myfaces.tobago.interna
tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UICommand",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommand",
+ uiComponentFacesClass = "javax.faces.component.UICommand",
+ componentFamily = UICommand.COMPONENT_FAMILY,
rendererType = RendererTypes.COMMAND,
allowedChildComponenents = "NONE")
public interface CommandTagDeclaration
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DatePickerTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -30,6 +30,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UICommand;
+
/**
* Renders a date picker.
* The component needs a DateFormat Pattern from a converter. The converter
@@ -40,6 +42,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIDatePicker",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIDatePicker",
+ uiComponentFacesClass = "javax.faces.component.UICommand",
+ componentFamily = UICommand.COMPONENT_FAMILY,
rendererType = RendererTypes.DATE_PICKER,
allowedChildComponenents = "NONE")
public interface DatePickerTagDeclaration
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -31,11 +31,13 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.InputTagDeclaration;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
+import javax.faces.component.UIInput;
+
/**
* Renders a date input field.
*/
@@ -43,6 +45,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIDate",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIDate",
+ uiComponentFacesClass = "javax.faces.component.UIInput",
+ componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.DATE,
allowedChildComponenents = "NONE",
facets = {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java Fri Feb 8 14:58:05 2013
@@ -28,9 +28,13 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIPanel;
+
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIExtensionPanel",
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanel",
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
+ componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.PANEL)
public interface ExtensionPanelDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent,
IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -43,6 +43,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
+import javax.faces.component.UIInput;
+
/**
* Renders a file input field.
* You need to define an org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataFilter in your web.xml or
@@ -56,6 +58,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIFile",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIFile",
+ uiComponentFacesClass = "javax.faces.component.UIInput",
+ componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.FILE,
allowedChildComponenents = "NONE")
public interface FileTagDeclaration
@@ -69,7 +73,8 @@ public interface FileTagDeclaration
* uploaded file.
*/
@TagAttribute()
- @UIComponentTagAttribute(type = { "org.apache.commons.fileupload.FileItem" },
+ @UIComponentTagAttribute(
+ type = { "org.apache.commons.fileupload.FileItem" },
expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -25,6 +25,7 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.RendererTypes;
+import org.apache.myfaces.tobago.internal.component.AbstractUIFlowLayout;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasBinding;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasCurrentMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
@@ -41,8 +42,9 @@ import org.apache.myfaces.tobago.layout.
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIFlowLayout",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIFlowLayout",
+ uiComponentFacesClass = "javax.faces.component.UIComponentBase",
+ componentFamily = AbstractUIFlowLayout.COMPONENT_FAMILY,
rendererType = RendererTypes.FLOW_LAYOUT,
- componentFamily = "org.apache.myfaces.tobago.FlowLayout",
allowedChildComponenents = "NONE", isLayout = true)
public interface FlowLayoutTagDeclaration
extends HasId,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -25,15 +25,15 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.internal.taglib.declaration.HasBinding;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
-/*
- * Date: 11.02.2006
- * Time: 14:29:26
- */
+import javax.faces.component.UIForm;
+
@Tag(name = "form")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIForm",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIForm",
+ uiComponentFacesClass = "javax.faces.component.UIForm",
interfaces = "org.apache.myfaces.tobago.component.Form",
+ componentFamily = UIForm.COMPONENT_FAMILY,
rendererType = RendererTypes.FORM,
isTransparentForLayout = true,
allowedChildComponenents = "ALL")
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -25,6 +25,7 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.RendererTypes;
+import org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasBinding;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasBorder;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasColumnLayout;
@@ -97,8 +98,9 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIGridLayout",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout",
+ uiComponentFacesClass = "javax.faces.component.UIComponentBase",
+ componentFamily = AbstractUIGridLayout.COMPONENT_FAMILY,
rendererType = RendererTypes.GRID_LAYOUT,
- componentFamily = "org.apache.myfaces.tobago.GridLayout",
allowedChildComponenents = "NONE", isLayout = true)
public interface GridLayoutTagDeclaration extends HasId, HasBorder, HasSpacing, HasMargin,
HasMargins, HasColumnLayout, HasRowLayout, HasBinding, HasMarkup, HasCurrentMarkup {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -29,6 +29,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
+import javax.faces.component.UIInput;
+
/**
* Renders a hidden input element.
*/
@@ -36,6 +38,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIHidden",
uiComponentBaseClass = "javax.faces.component.UIInput",
+ uiComponentFacesClass = "javax.faces.component.UIInput",
+ componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.HIDDEN,
allowedChildComponenents = "NONE")
public interface HiddenTagDeclaration extends HasIdBindingAndRendered, HasValue, HasConverter, HasValidator,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -34,6 +34,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponentWithDimension;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIGraphic;
+
/**
* Renders an image.
*/
@@ -41,6 +43,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIImage",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIImage",
+ uiComponentFacesClass = "javax.faces.component.UIGraphic",
+ componentFamily = UIGraphic.COMPONENT_FAMILY,
rendererType = RendererTypes.IMAGE,
allowedChildComponenents = "NONE")
public interface ImageTagDeclaration
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -40,6 +40,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
+import javax.faces.component.UIInput;
+
/**
* Renders a text input field.
*/
@@ -48,9 +50,11 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIIn",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIInput",
+ uiComponentFacesClass = "javax.faces.component.UIInput",
+ componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.IN,
allowedChildComponenents = "NONE",
- interfaces = {"org.apache.myfaces.tobago.component.InputSuggest", "org.apache.myfaces.tobago.component.UIInput"},
+ interfaces = {"org.apache.myfaces.tobago.component.InputSuggest"},
facets = {
@Facet(name = Facets.CHANGE,
description =
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -33,6 +33,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
+import javax.faces.component.UIOutput;
+
/**
* Renders a label component.
*/
@@ -40,6 +42,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILabel",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUILabel",
+ uiComponentFacesClass = "javax.faces.component.UIOutput",
+ componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.LABEL,
allowedChildComponenents = "NONE")
public interface LabelTagDeclaration extends HasIdBindingAndRendered,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -38,6 +38,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
+import javax.faces.component.UICommand;
+
/**
* Renders a link element.
*/
@@ -46,7 +48,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILink",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUILink",
- interfaces = "org.apache.myfaces.tobago.component.UILinkCommand",
+ uiComponentFacesClass = "javax.faces.component.UICommand",
+ componentFamily = UICommand.COMPONENT_FAMILY,
rendererType = RendererTypes.LINK,
allowedChildComponenents = "NONE",
facets = {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -29,6 +29,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UIPanel;
+
/**
* Component to put other components from other frameworks into.
* Gives the possibility, to interchange layout information.
@@ -37,6 +39,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMediator",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIMediator",
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
+ componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.MEDIATOR,
interfaces = {"org.apache.myfaces.tobago.component.SupportsMarkup"})
public interface MediatorTagDeclaration
@@ -46,6 +50,6 @@ public interface MediatorTagDeclaration
* Name of a request-scope attribute under which this component is accessible.
*/
@TagAttribute
- @UIComponentTagAttribute
+ @UIComponentTagAttribute(generate = false)
void setVar(String var);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -28,6 +28,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UIPanel;
+
/**
* Renders a menu bar.<br />
* Add menu bar as facet name="menuBar" to page tag or use it anywhere
@@ -43,7 +45,10 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenuBar",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIMenuBar",
- rendererType = RendererTypes.MENU_BAR, isComponentAlreadyDefined = false,
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
+ componentFamily = UIPanel.COMPONENT_FAMILY,
+ rendererType = RendererTypes.MENU_BAR,
+ isComponentAlreadyDefined = false,
allowedChildComponenents = {
"org.apache.myfaces.tobago.Menu",
"org.apache.myfaces.tobago.MenuCommand",
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -23,22 +23,27 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.AbstractCommandTagDeclaration;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasCurrentMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasImage;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabelAndAccessKey;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
+import javax.faces.component.UICommand;
+
/**
- * Renders a menu item.
+ * Renders a menu item. (This tag was renamed from tc:menuItem since Tobago 1.5.0)
*/
@Tag(name = "menuCommand",
-// deprecatedName = "menuItem",
tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenuCommand",
- uiComponentBaseClass = "org.apache.myfaces.tobago.component.UICommand",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommandBase",
+ uiComponentFacesClass = "javax.faces.component.UICommand",
+ componentFamily = UICommand.COMPONENT_FAMILY,
rendererType = RendererTypes.MENU_COMMAND,
allowedChildComponenents = "NONE")
public interface MenuCommandTagDeclaration extends AbstractCommandTagDeclaration,
- HasIdBindingAndRendered, HasLabelAndAccessKey, IsDisabled, HasImage {
+ HasIdBindingAndRendered, HasLabelAndAccessKey, IsDisabled, HasImage, HasMarkup, HasCurrentMarkup {
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -28,6 +28,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
+import javax.faces.component.UIOutput;
+
/**
* Renders a separator inside of a menu.
*/
@@ -35,6 +37,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenuSeparator",
uiComponentBaseClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "javax.faces.component.UIOutput",
+ componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.MENU_SEPARATOR,
allowedChildComponenents = "NONE")
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -31,6 +31,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UIPanel;
+
/**
* Container component to hold submenus and items.
*/
@@ -44,6 +46,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenu",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIMenu",
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
+ componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.MENU,
allowedChildComponenents = {
"org.apache.myfaces.tobago.Menu",
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -32,6 +32,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UIMessages;
+
/*
* Date: 02.04.2006
* Time: 15:53:45
@@ -44,6 +46,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMessages",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIMessages",
+ uiComponentFacesClass = "javax.faces.component.UIMessages",
+ componentFamily = UIMessages.COMPONENT_FAMILY,
rendererType = RendererTypes.MESSAGES,
allowedChildComponenents = "NONE")
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -30,14 +30,14 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-/*
- * Date: 02.04.2006
- * Time: 15:58:16
- */
+import javax.faces.component.UIOutput;
+
@Tag(name = "object", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIObject",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIOut",
+ uiComponentFacesClass = "javax.faces.component.UIOutput",
+ componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.OBJECT,
allowedChildComponenents = "NONE")
public interface ObjectTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent, HasMarkup,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -34,6 +34,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UIOutput;
+
/**
* Renders a text
*/
@@ -42,7 +44,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIOut",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIOut",
- interfaces = "org.apache.myfaces.tobago.component.UIOutput",
+ uiComponentFacesClass = "javax.faces.component.UIOutput",
+ componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.OUT,
allowedChildComponenents = "NONE")
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -35,6 +35,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponentWithDimension;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIForm;
+
/**
* Renders a page element.
*/
@@ -42,6 +44,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPage",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIPage",
+ uiComponentFacesClass = "javax.faces.component.UIForm",
+ componentFamily = UIForm.COMPONENT_FAMILY,
rendererType = RendererTypes.PAGE,
facets =
{ @Facet(name = Facets.ACTION,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -31,6 +31,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIPanel;
+
/**
* Intended for use in situations when only one UIComponent child can be
* nested, such as in the case of facets.
@@ -39,6 +41,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPanel",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIPanel",
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
+ componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.PANEL,
interfaces = "org.apache.myfaces.tobago.component.SupportsMarkup",
facets = {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -32,6 +32,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponentWithDimension;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
+import javax.faces.component.UIPanel;
+
/**
* Renders a popup panel.
* The popup gets a grid layout manager with columns="auto" and rows="auto" as definition.
@@ -42,6 +44,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPopup",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIPopup",
+ uiComponentFacesClass = "javax.faces.component.UIPanel",
+ componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.POPUP,
facets = {
@Facet(name = Facets.LAYOUT,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -33,6 +33,8 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
+import javax.faces.component.UIOutput;
+
/**
* Renders a progress bar.
*/
@@ -40,6 +42,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIProgress",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIOut",
+ uiComponentFacesClass = "javax.faces.component.UIOutput",
+ componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.PROGRESS,
allowedChildComponenents = "NONE",
facets = {@Facet(
@@ -55,7 +59,8 @@ public interface ProgressTagDeclaration
* The current value of this component.
*/
@TagAttribute
- @UIComponentTagAttribute(type = { "javax.swing.BoundedRangeModel" },
+ @UIComponentTagAttribute(
+ type = { "javax.swing.BoundedRangeModel" },
expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ReloadTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -31,6 +31,7 @@ import org.apache.myfaces.tobago.interna
@Tag(name = "reload")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIReload",
+ uiComponentFacesClass = "javax.faces.component.UIComponentBase",
componentFamily = "org.apache.myfaces.tobago.Reload",
allowedChildComponenents = "NONE")
public interface ReloadTagDeclaration extends HasIdBindingAndRendered {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -33,6 +33,7 @@ import org.apache.myfaces.tobago.interna
@Tag(name = "script")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIScript",
+ uiComponentFacesClass = "javax.faces.component.UIComponentBase",
componentFamily = "org.apache.myfaces.tobago.Script",
rendererType = RendererTypes.SCRIPT,
isTransparentForLayout = true,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -33,7 +33,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessage;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessageForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValidator;
@@ -45,7 +45,9 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
+
+import javax.faces.component.UISelectBoolean;
/**
* Renders a checkbox.
@@ -55,6 +57,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCheckbox",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectBooleanCheckbox",
+ uiComponentFacesClass = "javax.faces.component.UISelectBoolean",
+ componentFamily = UISelectBoolean.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_BOOLEAN_CHECKBOX,
allowedChildComponenents = "NONE",
facets = {
@@ -70,7 +74,8 @@ import org.apache.myfaces.tobago.interna
public interface SelectBooleanCheckboxTagDeclaration extends HasValidator,
HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasValue, IsDisabled,
- IsDeprecatedInline, HasTip, IsReadonly, HasMarkup, HasCurrentMarkup, HasTabIndex, IsRequired, HasConverter, IsFocus,
- HasValidatorMessage, HasRequiredMessage, HasConverterMessage, IsGridLayoutComponent, HasItemLabel {
+ IsDeprecatedInline, HasTip, IsReadonly, HasMarkup, HasCurrentMarkup, HasTabIndex,
+ IsRequiredForSelect, HasConverter, IsFocus,
+ HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage, IsGridLayoutComponent, HasItemLabel {
// IsImmediateComponent
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -26,7 +26,8 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
- uiComponentBaseClass = "org.apache.myfaces.tobago.component.UICommand")
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommandBase",
+ uiComponentFacesClass = "javax.faces.component.UICommand")
public interface SelectBooleanCommandTagDeclaration
extends AbstractCommandTagDeclaration, HasIdBindingAndRendered, HasValue {
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -45,6 +45,7 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectItem",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectItem",
+ uiComponentFacesClass = "javax.faces.component.UISelectItem",
allowedChildComponenents = "NONE")
public interface SelectItemTagDeclaration extends HasBinding, HasId, HasMarkup, HasCurrentMarkup, HasItemLabel {
/**
@@ -74,7 +75,8 @@ public interface SelectItemTagDeclaratio
* the information for this option.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.model.SelectItem",
+ @UIComponentTagAttribute(
+ type = "javax.faces.model.SelectItem",
expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -37,6 +37,7 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectItems",
uiComponentBaseClass = "javax.faces.component.UISelectItems",
+ uiComponentFacesClass = "javax.faces.component.UISelectItems",
isComponentAlreadyDefined = false,
allowedChildComponenents = "NONE")
public interface SelectItemsTagDeclaration extends HasId, HasBinding {
@@ -46,7 +47,8 @@ public interface SelectItemsTagDeclarati
* the information for this option.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.model.SelectItem[]",
+ @UIComponentTagAttribute(
+ type = "javax.faces.model.SelectItem[]",
expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -34,7 +34,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRenderRange;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessage;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessageForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValidator;
@@ -46,7 +46,9 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsInline;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
+
+import javax.faces.component.UISelectMany;
/**
* Render a group of checkboxes.
@@ -56,14 +58,17 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectManyCheckbox",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectMany",
+ uiComponentFacesClass = "javax.faces.component.UISelectMany",
+ componentFamily = UISelectMany.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_MANY_CHECKBOX,
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"})
public interface SelectManyCheckboxTagDeclaration extends
- IsDisabled, HasId, HasTip, IsInline, HasRenderRange, IsRendered, IsRequired, HasBinding, IsReadonly, HasConverter,
+ IsDisabled, HasId, HasTip, IsInline, HasRenderRange, IsRendered, IsRequiredForSelect,
+ HasBinding, IsReadonly, HasConverter,
HasMarkup, HasCurrentMarkup, HasInputLabel, HasValidator, HasOnchange, HasValueChangeListener,
- HasValidatorMessage, HasConverterMessage, HasRequiredMessage, HasTabIndex, IsFocus, IsGridLayoutComponent {
+ HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, IsGridLayoutComponent {
/**
* The value of the multi select.
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java?rev=1444036&r1=1444035&r2=1444036&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java Fri Feb 8 14:58:05 2013
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessage;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessageForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValidator;
@@ -44,7 +44,9 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
+
+import javax.faces.component.UISelectMany;
/**
* Render a multi selection option listbox.
@@ -53,14 +55,17 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectManyListbox",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectMany",
+ uiComponentFacesClass = "javax.faces.component.UISelectMany",
+ componentFamily = UISelectMany.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_MANY_LISTBOX,
allowedChildComponenents = {"javax.faces.SelectItem", "javax.faces.SelectItems"})
public interface SelectManyListboxTagDeclaration
extends HasId, IsDisabled, IsRendered, HasBinding, HasTip,
- IsReadonly, HasConverter, IsRequired, HasMarkup, HasCurrentMarkup, IsDeprecatedInline, HasLabelAndAccessKey,
+ IsReadonly, HasConverter, IsRequiredForSelect, HasMarkup, HasCurrentMarkup,
+ IsDeprecatedInline, HasLabelAndAccessKey,
HasValidator, HasOnchange, HasValueChangeListener,
- HasValidatorMessage, HasConverterMessage, HasRequiredMessage, HasTabIndex, IsFocus, IsGridLayoutComponent {
+ HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, IsGridLayoutComponent {
/**
* The value of the multi select.