You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/09/04 12:58:06 UTC
svn commit: r1380545 - in
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago:
component/ internal/taglib/component/
Author: lofwyr
Date: Tue Sep 4 10:58:05 2012
New Revision: 1380545
URL: http://svn.apache.org/viewvc?rev=1380545&view=rev
Log:
convention over configuration
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java
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/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/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/DatePickerTagDeclaration.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/OutTagDeclaration.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/SeparatorTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java?rev=1380545&r1=1380544&r2=1380545&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/ComponentTypes.java Tue Sep 4 10:58:05 2012
@@ -26,15 +26,28 @@ public final class ComponentTypes {
// TODO: make a complete list.
+ public static final String BOX = "org.apache.myfaces.tobago.Box";
+ public static final String BUTTON = "org.apache.myfaces.tobago.Button";
+ @Deprecated
+ public static final String CELL = "org.apache.myfaces.tobago.Cell";
public static final String COLUMN = "org.apache.myfaces.tobago.Column";
+ public static final String COLUMN_EVENT = "org.apache.myfaces.tobago.ColumnEvent";
public static final String COLUMN_SELECTOR = "org.apache.myfaces.tobago.ColumnSelector";
+ public static final String COMMAND = "org.apache.myfaces.tobago.Command";
+ public static final String DATE_PICKER = "org.apache.myfaces.tobago.DatePicker";
+ public static final String EXTENSION_PANEL = "org.apache.myfaces.tobago.ExtensionPanel";
public static final String GRID_LAYOUT = "org.apache.myfaces.tobago.GridLayout";
public static final String IN = "org.apache.myfaces.tobago.In";
+ public static final String LINK = "org.apache.myfaces.tobago.Link";
public static final String OUT = "org.apache.myfaces.tobago.Out";
public static final String PANEL = "org.apache.myfaces.tobago.Panel";
- public static final String EXTENSION_PANEL = "org.apache.myfaces.tobago.ExtensionPanel";
+ public static final String POPUP = "org.apache.myfaces.tobago.Popup";
+ public static final String RELOAD = "org.apache.myfaces.tobago.Reload";
+ public static final String SCRIPT = "org.apache.myfaces.tobago.Script";
+ public static final String SEPARATOR = "org.apache.myfaces.tobago.Separator";
public static final String SELECT_BOOLEAN_CHECKBOX = "org.apache.myfaces.tobago.SelectBooleanCheckbox";
public static final String SHEET_LAYOUT = "org.apache.myfaces.tobago.SheetLayout";
+ public static final String STYLE = "org.apache.myfaces.tobago.Style";
public static final String TAB_GROUP_LAYOUT = "org.apache.myfaces.tobago.TabGroupLayout";
private ComponentTypes() {
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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -40,7 +40,6 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIBox",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIBox",
- componentType = "org.apache.myfaces.tobago.Box",
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/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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -23,6 +23,7 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.component.ComponentTypes;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasCurrentMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
@@ -40,7 +41,6 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UICell",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICell",
- componentType = "org.apache.myfaces.tobago.Cell",
rendererType = RendererTypes.CELL)
public interface CellTagDeclaration
extends HasIdBindingAndRendered, IsGridLayoutComponent, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup {
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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -31,8 +31,7 @@ import org.apache.myfaces.tobago.interna
@Tag(name = "columnEvent")
@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UIColumnEvent",
uiComponentBaseClass = "javax.faces.component.UIColumn",
- interfaces = "org.apache.myfaces.tobago.component.ColumnEvent",
- componentType = "org.apache.myfaces.tobago.ColumnEvent")
+ interfaces = "org.apache.myfaces.tobago.component.ColumnEvent")
public interface ColumnEventTagDeclaration extends HasIdBindingAndRendered {
@TagAttribute
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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.component.ComponentTypes;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasBinding;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
@@ -35,7 +34,6 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumnSelector",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIColumnSelector",
- componentType = ComponentTypes.COLUMN_SELECTOR,
rendererType = RendererTypes.COLUMN_SELECTOR,
allowedChildComponenents = "NONE")
public interface ColumnSelectorTagDeclaration extends IsDisabled, IsRendered, HasBinding {
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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -24,7 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.ComponentTypes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasCurrentMarkup;
@@ -42,7 +41,6 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumn",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIColumn",
- componentType = ComponentTypes.COLUMN,
rendererType = RendererTypes.COLUMN,
facets = {
@Facet(name = Facets.MENUPOPUP, description = "Deprecated. Please use dropDownMenu facet.",
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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -40,7 +40,6 @@ import org.apache.myfaces.tobago.interna
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIDatePicker",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIDatePicker",
- componentType = "org.apache.myfaces.tobago.DatePicker",
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/NamingContainerDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/NamingContainerDeclaration.java?rev=1380545&r1=1380544&r2=1380545&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/NamingContainerDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/NamingContainerDeclaration.java Tue Sep 4 10:58:05 2012
@@ -21,8 +21,10 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+import javax.faces.component.UINamingContainer;
+
@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UINamingContainer",
uiComponentBaseClass = "javax.faces.component.UINamingContainer",
- componentType = "javax.faces.NamingContainer")
+ componentType = UINamingContainer.COMPONENT_TYPE)
public interface NamingContainerDeclaration {
}
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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -44,7 +44,6 @@ import org.apache.myfaces.tobago.interna
uiComponent = "org.apache.myfaces.tobago.component.UIOut",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIOut",
interfaces = "org.apache.myfaces.tobago.component.UIOutput",
- componentType = ComponentTypes.OUT,
rendererType = RendererTypes.OUT,
allowedChildComponenents = "NONE")
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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -23,6 +23,7 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.component.ComponentTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
/**
@@ -31,7 +32,6 @@ import org.apache.myfaces.tobago.interna
@Tag(name = "reload")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIReload",
- componentType = "org.apache.myfaces.tobago.Reload",
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=1380545&r1=1380544&r2=1380545&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 Tue Sep 4 10:58:05 2012
@@ -23,6 +23,7 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.component.ComponentTypes;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
@@ -32,7 +33,6 @@ import org.apache.myfaces.tobago.interna
@Tag(name = "script")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIScript",
- componentType = "org.apache.myfaces.tobago.Script",
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/SeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java?rev=1380545&r1=1380544&r2=1380545&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java Tue Sep 4 10:58:05 2012
@@ -34,11 +34,11 @@ import org.apache.myfaces.tobago.interna
* Renders a separator.
*/
@Tag(name = "separator")
-@UIComponentTag(rendererType = RendererTypes.SEPARATOR,
+@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISeparator",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISeparator",
componentFamily = "org.apache.myfaces.tobago.Separator",
- componentType = "org.apache.myfaces.tobago.Separator",
+ rendererType = RendererTypes.SEPARATOR,
allowedChildComponenents = "NONE",
facets = {
@Facet(name = Facets.LABEL,
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java?rev=1380545&r1=1380544&r2=1380545&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java Tue Sep 4 10:58:05 2012
@@ -36,7 +36,6 @@ import org.apache.myfaces.tobago.interna
@BodyContentDescription(contentType = "css")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIStyle",
- componentType = "org.apache.myfaces.tobago.Style",
componentFamily = "org.apache.myfaces.tobago.Style",
rendererType = RendererTypes.STYLE,
isTransparentForLayout = true,