You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/01/11 20:58:36 UTC
svn commit: r611283 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/
Author: lofwyr
Date: Fri Jan 11 11:58:34 2008
New Revision: 611283
URL: http://svn.apache.org/viewvc?rev=611283&view=rev
Log:
codestyle + using String[] instead of concat with SPACE
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -22,6 +22,11 @@
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedWidth;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
+import org.apache.myfaces.tobago.component.UIMenu;
+import org.apache.myfaces.tobago.component.UIMenuCommand;
+import org.apache.myfaces.tobago.component.UISelectBooleanCommand;
+import org.apache.myfaces.tobago.component.UIMenuSelectOne;
+import org.apache.myfaces.tobago.component.UIMenuSeparator;
/*
* Date: 14.03.2006
@@ -43,10 +48,12 @@
@UIComponentTag(
uiComponent = "javax.faces.component.UIPanel",
rendererType = "MenuBar", isComponentAlreadyDefined = false, // changed to false
- allowedChildComponenents = "org.apache.myfaces.tobago.Menu " +
- "org.apache.myfaces.tobago.MenuCommand " +
- "org.apache.myfaces.tobago.SelectBooleanCommand " +
- "org.apache.myfaces.tobago.MenuSelectOne " +
- "org.apache.myfaces.tobago.MenuSeparator")
+ allowedChildComponenents = {
+ UIMenu.COMPONENT_TYPE,
+ UIMenuCommand.COMPONENT_TYPE,
+ UISelectBooleanCommand.COMPONENT_TYPE,
+ UIMenuSelectOne.COMPONENT_TYPE,
+ UIMenuSeparator.COMPONENT_TYPE
+ })
public interface MenuBarTagDeclaration extends TobagoBodyTagDeclaration, HasIdBindingAndRendered, HasDeprecatedWidth {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -37,7 +37,9 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
rendererType = "MenuCommand",
- allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems")
+ allowedChildComponenents = {
+ "javax.faces.SelectItem",
+ "javax.faces.SelectItems"})
public interface MenuCheckboxTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
HasIdBindingAndRendered, IsDisabled, HasCommandType, HasBooleanValue,
HasLabelAndAccessKey {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -24,6 +24,11 @@
import org.apache.myfaces.tobago.taglib.decl.HasImage;
import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
+import org.apache.myfaces.tobago.component.UIMenu;
+import org.apache.myfaces.tobago.component.UIMenuCommand;
+import org.apache.myfaces.tobago.component.UISelectBooleanCommand;
+import org.apache.myfaces.tobago.component.UIMenuSelectOne;
+import org.apache.myfaces.tobago.component.UIMenuSeparator;
/*
* Date: 31.03.2006
@@ -42,11 +47,12 @@
"org.apache.myfaces.tobago.taglib.component.MenuSeparatorTag"})
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenu",
- allowedChildComponenents = "org.apache.myfaces.tobago.Menu " +
- "org.apache.myfaces.tobago.MenuCommand " +
- "org.apache.myfaces.tobago.SelectBooleanCommand " +
- "org.apache.myfaces.tobago.MenuSelectOne " +
- "org.apache.myfaces.tobago.MenuSeparator")
+ allowedChildComponenents = {
+ UIMenu.COMPONENT_TYPE,
+ UIMenuCommand.COMPONENT_TYPE,
+ UISelectBooleanCommand.COMPONENT_TYPE,
+ UIMenuSelectOne.COMPONENT_TYPE,
+ UIMenuSeparator.COMPONENT_TYPE})
public interface MenuTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasLabelAndAccessKey,
IsDisabled, HasImage {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -44,7 +44,9 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectMany",
rendererType = "SelectManyCheckbox",
- allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems")
+ allowedChildComponenents = {
+ "javax.faces.SelectItem",
+ "javax.faces.SelectItems"})
public interface SelectManyCheckboxTagDeclaration extends
SelectManyTagDeclaration, IsDisabled, HasId,
IsInline, HasRenderRange, IsRendered, IsRequired, HasBinding, IsReadonly, HasConverter {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -42,7 +42,10 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectMany",
rendererType = "SelectManyListbox",
- allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems")
+ allowedChildComponenents = {
+ "javax.faces.SelectItem",
+ "javax.faces.SelectItems"
+ })
public interface SelectManyListboxTagDeclaration
extends SelectManyTagDeclaration, HasId, IsDisabled,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -47,7 +47,10 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneChoice",
- allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems",
+ allowedChildComponenents = {
+ "javax.faces.SelectItem",
+ "javax.faces.SelectItems"
+ },
facets = {
@Facet(name = "click",
description =
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -45,7 +45,10 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneListbox",
- allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems",
+ allowedChildComponenents = {
+ "javax.faces.SelectItem",
+ "javax.faces.SelectItems"
+ },
facets = {
@Facet(name = "click",
description =
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -44,7 +44,10 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneRadio",
- allowedChildComponenents = "javax.faces.SelectItem javax.faces.SelectItems",
+ allowedChildComponenents = {
+ "javax.faces.SelectItem",
+ "javax.faces.SelectItems"
+ },
facets = {
@Facet(name = "click",
description =
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -42,7 +42,9 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIData",
rendererType = "Sheet",
- allowedChildComponenents = "javax.faces.Column org.apache.myfaces.tobago.ColumnSelector",
+ allowedChildComponenents = {
+ "javax.faces.Column",
+ "org.apache.myfaces.tobago.ColumnSelector"},
facets = {@Facet(name="reload", description = "Contains an instance of UIReload",
allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -60,9 +60,10 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIToolBar",
rendererType = "ToolBar",
- allowedChildComponenents = "org.apache.myfaces.tobago.SelectOneCommand " +
- "org.apache.myfaces.tobago.SelectBooleanCommand " +
- "org.apache.myfaces.tobago.Command")
+ allowedChildComponenents = {
+ "org.apache.myfaces.tobago.SelectOneCommand",
+ "org.apache.myfaces.tobago.SelectBooleanCommand",
+ "org.apache.myfaces.tobago.Command"})
public interface ToolBarTagDeclaration extends PanelTagDeclaration {
/**
* Position of the button label, possible values are: right, bottom, off.
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeDataTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -24,6 +24,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasTreeNodeValue;
import org.apache.myfaces.tobago.taglib.decl.HasVar;
+import org.apache.myfaces.tobago.component.UITreeNode;
/**
* Describes a subtree of nodes.
@@ -33,7 +34,7 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeData",
rendererType = "TreeData",
- allowedChildComponenents = "org.apache.myfaces.tobago.TreeNode")
+ allowedChildComponenents = UITreeNode.COMPONENT_TYPE)
public interface TreeDataTagDeclaration extends TobagoTagDeclaration,
HasIdBindingAndRendered, HasTreeNodeValue, HasVar {
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -32,6 +32,8 @@
import org.apache.myfaces.tobago.taglib.decl.HasTip;
import org.apache.myfaces.tobago.taglib.decl.HasValue;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
+import org.apache.myfaces.tobago.component.UITreeNode;
+import org.apache.myfaces.tobago.component.UITreeData;
/**
* Creates a tree node.
@@ -42,8 +44,10 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
rendererType = "TreeNode",
- allowedChildComponenents = "org.apache.myfaces.tobago.TreeNode " +
- "org.apache.myfaces.tobago.TreeData",
+ allowedChildComponenents = {
+ UITreeNode.COMPONENT_TYPE,
+ UITreeData.COMPONENT_TYPE
+ },
facets = {
@Facet(name = "addendum", description = "Displays an additional component to a node.")})
public interface TreeNodeTagDeclaration
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java?rev=611283&r1=611282&r2=611283&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java Fri Jan 11 11:58:34 2008
@@ -26,6 +26,8 @@
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasTreeNodeValue;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.component.UITreeNode;
+import org.apache.myfaces.tobago.component.UITreeData;
/**
* Renders a tree view.
@@ -37,9 +39,11 @@
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITree",
rendererType = "Tree",
- allowedChildComponenents = "org.apache.myfaces.tobago.TreeNode " +
- "org.apache.myfaces.tobago.TreeData")
-public interface TreeTagDeclaration
+ allowedChildComponenents = {
+ UITreeNode.COMPONENT_TYPE,
+ UITreeData.COMPONENT_TYPE
+ })
+public interface TreeTagDeclaration
extends TobagoTagDeclaration, HasIdBindingAndRendered, HasTreeNodeValue, IsRequired {
/**