[seam-commits] Seam SVN: r15366 - in branches/enterprise/WFK-2_1/jboss-seam-ui/src/main: java/org/jboss/seam/ui/graphicImage and 1 other directories.

Author: vdedik Date: 2012-11-20 08:47:11 -0500 (Tue, 20 Nov 2012) New Revision: 15366 Removed: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/resources/META-INF/cdk/ Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIButton.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationName.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILabel.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIMessage.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIRemote.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java Log: JBSEAM-5057 - Move all Seam UI faces-config properties from xml into annotation fields/methods Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIButton.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIButton.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIButton.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -36,7 +36,7 @@ family="org.jboss.seam.ui.Button", type="org.jboss.seam.ui.Button",generate="org.jboss.seam.ui.component.html.HtmlButton", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="button", handler="org.jboss.seam.ui.handler.CommandButtonParameterComponentHandler"), renderer = @JsfRenderer(type="org.jboss.seam.ui.ButtonRenderer", family="org.jboss.seam.ui.ButtonRenderer"), - attributes = {"command-button-props.xml", "javax.faces.component.UICommand.xml", "javax.faces.component.ValueHolder.xml", "i18n-props.xml", "accesskey-props.xml", "button.xml" }) + attributes = {"command-button-props.xml", "javax.faces.component.UICommand.xml", "javax.faces.component.ValueHolder.xml", "i18n-props.xml", "accesskey-props.xml" }) public abstract class UIButton extends UISeamCommandBase { @Attribute @@ -53,5 +53,29 @@ @Attribute public abstract String getImage(); + + @Attribute(defaultValue = "true", description = @Description("Include page parameters defined in pages.xml when rendering the button")) + public abstract boolean isIncludePageParams(); + + @Attribute(description = @Description("The name of the conversation for natural conversations")) + public abstract String getConversationName(); + + @Attribute(description = @Description("Specify the task to operate on (e.g. for @StartTask)")) + public abstract Object getTaskInstance(); + + @Attribute + public abstract String getOutcome(); + + @Attribute(description = @Description("the fragment identifier to link to.")) + public abstract String getFragment(); + + @Attribute(defaultValue = "default", description = @Description("determines the conversation propagation style: begin, join, nest, none, end or endRoot.")) + public abstract String getPropagation(); + + @Attribute(description = @Description("a pageflow definition to begin. (This is only useful when propagation=\"begin\" or propagation=\"join\".)")) + public abstract String getPageflow(); + + @Attribute(description = @Description("the JSF view id to link to.")) + public abstract String getView(); } Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -39,20 +39,23 @@ family="org.jboss.seam.ui.Cache", type="org.jboss.seam.ui.Cache",generate="org.jboss.seam.ui.component.html.HtmlCache", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="cache"), renderer = @JsfRenderer(type="org.jboss.seam.ui.CacheRenderer", family="org.jboss.seam.ui.CacheRenderer"), -attributes = {"base-props.xml", "cache.xml" }) +attributes = {"base-props.xml" }) public abstract class UICache extends UIComponentBase { - @Attribute + @Attribute(defaultValue = "true", description = @Description("a value expression that determines if the cache should be used.")) public abstract boolean isEnabled(); - @Attribute + @Attribute(description = @Description("the key to cache rendered content, often a value expression. For example, " + + "if we were caching a page fragment that displays a document, we might use key=\"Document-#{document.id}\".")) public abstract String getKey(); - @Attribute + @Attribute(description = @Description("a cache node to use (different nodes can have different expiry policies).")) public abstract String getRegion(); - @Attribute + @Attribute(defaultValue = "org.jboss.seam.cache.CacheProvider.instance()", + description = @Description("The cache provider to use, only needed if you install alter the default " + + "cache provider in an application where multiple cache providers are in use")) public abstract CacheProvider getCacheProvider(); } Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -41,7 +41,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.ConversationId&quot;,value=&quot;Add the conversation id to JSF link or button (e.g. &lt;h:commandLink/&gt;, &lt;s:button/&gt;)."), family="org.jboss.seam.ui.ConversationId", type="org.jboss.seam.ui.ConversationId",generate="org.jboss.seam.ui.component.html.HtmlConversationId", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="conversationId"), -attributes = {"javax.faces.component.UIParameter.xml", "conversationId.xml"}) +attributes = {"javax.faces.component.UIParameter.xml"}) public abstract class UIConversationId extends UIParameter { private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationId"; Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationName.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationName.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationName.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -19,7 +19,7 @@ family="org.jboss.seam.ui.ConversationName", type="org.jboss.seam.ui.ConversationName",generate="org.jboss.seam.ui.component.html.HtmlConversationName", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="conversationName", handler="org.jboss.seam.ui.handler.CommandButtonParameterComponentHandler"), renderer = @JsfRenderer(type="org.jboss.seam.ui.ConversationNameRenderer", family="org.jboss.seam.ui.ConversationNameRenderer"), -attributes = {"conversationName.xml" }) +attributes = {"javax.faces.component.UIParameter.xml" }) public abstract class UIConversationName extends UIParameter { private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationName"; Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -39,7 +39,7 @@ family="org.jboss.seam.ui.ConversationPropagation", type="org.jboss.seam.ui.ConversationPropagation",generate="org.jboss.seam.ui.component.html.HtmlConversationPropagation", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="conversationPropagation"), renderer = @JsfRenderer(type="org.jboss.seam.ui.ConversationPropagationRenderer", family="org.jboss.seam.ui.ConversationPropagationRenderer"), -attributes = {"conversationPropagation.xml" }) +attributes = {"javax.faces.component.UIParameter.xml" }) public abstract class UIConversationPropagation extends UIParameter { private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationPropagation"; @@ -56,12 +56,12 @@ return getPageflow()==null ? getType() : getType() + "." + getPageflow(); } - @Attribute + @Attribute(description = @Description("a pageflow definition to begin. (This is only useful when propagation=\"begin\" or propagation=\"join\".)")) public abstract String getPageflow(); public abstract void setPageflow(String pageflow); - @Attribute + @Attribute(defaultValue = "none", description = @Description("determines the conversation propagation style: begin, join, nested, none, end or endRoot.")) public abstract String getType(); public abstract void setType(String type); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -22,7 +22,7 @@ family="org.jboss.seam.ui.Decorate", type="org.jboss.seam.ui.Decorate",generate="org.jboss.seam.ui.component.html.HtmlDecorate", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="decorate", handler="org.jboss.seam.ui.handler.DecorateHandler"), renderer = @JsfRenderer(type="org.jboss.seam.ui.DecorateRenderer", family="org.jboss.seam.ui.DecorateRenderer"), -attributes = {"decorate.xml" }) +attributes = {"javax.faces.component.UIComponent.xml", "core-props.xml" }) public abstract class UIDecorate extends UIComponentBase implements NamingContainer { @@ -76,7 +76,7 @@ } } - @Attribute + @Attribute(description = @Description("Id of the input field to decorate")) public abstract String getFor(); @@ -92,12 +92,14 @@ public abstract void setStyle(String style); - @Attribute(defaultValue="true") + @Attribute(defaultValue="true", description = @Description("if true, the template used to decorate the input " + + "field is enclosed by the element specified with the \"element\" attribute. By default this is a div element.")) public abstract boolean isEnclose(); public abstract void setEnclose(boolean enclose); - @Attribute + @Attribute(defaultValue = "div", description = @Description("the element to enclose the template used to decorate " + + "the input field. By default, the template is enclosed with a div element.")) public abstract String getElement(); public abstract void setElement(String element); @@ -112,5 +114,7 @@ { return (UIDecorate) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE); } - + + @Attribute(description = @Description("XHTML template to use to decorate the input field")) + public abstract String getTemplate(); } Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -16,12 +16,46 @@ family="org.jboss.seam.ui.Download", type="org.jboss.seam.ui.Download",generate="org.jboss.seam.ui.component.html.HtmlDownload", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="download"), renderer = @JsfRenderer(type="org.jboss.seam.ui.DownloadRenderer", family="org.jboss.seam.ui.DownloadRenderer"), -attributes = {"core-props.xml", "link.xml", "download.xml" }) +attributes = {"core-props.xml", "javax.faces.component.UICommand.xml", "i18n-props.xml", + "javax.faces.component.UIOutput.xml", "javax.faces.component.UIGraphic.xml", "accesskey-props.xml"}) public abstract class UIDownload extends UILink { - @Attribute + @Attribute(description = @Description("Source xhtml file that acts as resource holder")) public abstract String getSrc(); public abstract void setSrc(String src); + @Attribute(defaultValue = "true", description = @Description("true iff this component should be rendered")) + public abstract boolean isRendered(); + + @Attribute(description = @Description("the JSF view id to link to.")) + public abstract String getView(); + + @Attribute(description = @Description("a pageflow definition to begin. (This is only useful when " + + "propagation=\"begin\" or propagation=\"join\".)")) + public abstract String getPageflow(); + + @Attribute(defaultValue = "default", + description = @Description("determines the conversation propagation style: begin, join, nest, none, end or endRoot.")) + public abstract String getPropagation(); + + @Attribute(description = @Description("the fragment identifier to link to.")) + public abstract String getFragment(); + + @Attribute(description = @Description("The outcome to use when evaluating navigation rules")) + public abstract String getOutcome(); + + @Attribute(description = @Description("If true, write the link as disabled in HTML")) + public abstract boolean isDisabled(); + + @Attribute(description = @Description("Specify the task to operate on (e.g. for @StartTask)")) + public abstract String getTaskInstance(); + + @Attribute(description = @Description("The name of the conversation for natural conversations")) + public abstract String getConversationName(); + + @Attribute(defaultValue = "true", + description = @Description("Include page parameters defined in pages.xml when rendering the button")) + public abstract boolean isIncludePageParams(); + } Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -16,18 +16,18 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.EnumItem&quot;,value=&quot;Creates a SelectItem from an enum value."), family="org.jboss.seam.ui.EnumItem", type="org.jboss.seam.ui.EnumItem",generate="org.jboss.seam.ui.component.html.HtmlEnumItem", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="enumItem"), -attributes = {"enumItem.xml" }) +attributes = {"base-props.xml", "javax.faces.component.UICommand.xml" }) public abstract class UIEnumItem extends UISelectItem { - @Attribute + @Attribute(description = @Description("the string representation of the enum value.")) public abstract String getEnumValue(); public abstract void setEnumValue(String enumValue); public abstract void setLabel(String label); - @Attribute + @Attribute(description = @Description("the label to be used when rendering the SelectItem.")) public abstract String getLabel(); @Override Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -16,33 +16,33 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.EqualityValidator&quot;,value=&quot;Validate all child JSF input fields against the bound propertys using Hibernate Validator."), family="org.jboss.seam.ui.EqualityValidator", type="org.jboss.seam.ui.EqualityValidator", generate="org.jboss.seam.ui.component.html.HtmlEqualityValidator", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="validateEquality"), -renderer = @JsfRenderer(type="org.jboss.seam.ui.EqualityValidatorRenderer", family="org.jboss.seam.ui.EqualityValidatorRenderer"), -attributes = {"equalityValidator.xml" }) +renderer = @JsfRenderer(type="org.jboss.seam.ui.EqualityValidatorRenderer", family="org.jboss.seam.ui.EqualityValidatorRenderer")) public abstract class UIEqualityValidator extends UIComponentBase { - @Attribute + @Attribute(description = @Description("Id of component to validate against")) public abstract String getFor(); public abstract void setFor(String forId); - @Attribute + @Attribute(description = @Description("Error message to show")) public abstract String getMessage(); public abstract void setMessage(String message); - @Attribute + @Attribute(description = @Description("Message id to use on failure")) public abstract String getMessageId(); public abstract void setMessageId(String messageId); public abstract void setOperator(String operator); - @Attribute + @Attribute(description = @Description("Operation to use.")) public abstract String getOperator(); public abstract void setRequired(boolean required); - @Attribute + @Attribute(defaultValue = "true", + description = @Description("True if a value is required for the filed to validate (default:true)")) public abstract boolean isRequired(); } Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -23,7 +23,7 @@ family="org.jboss.seam.ui.FileUpload", type="org.jboss.seam.ui.FileUpload",generate="org.jboss.seam.ui.component.html.HtmlFileUpload", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="fileUpload"), renderer = @JsfRenderer(type="org.jboss.seam.ui.FileUploadRenderer", family="org.jboss.seam.ui.FileUploadRenderer"), -attributes = {"fileUpload.xml" }) +attributes = {"core-props.xml", "focus-props.xml", "javax.faces.component.EditableValueHolder.xml" }) public abstract class UIFileUpload extends UIInput { @@ -280,8 +280,21 @@ public abstract void setAccept(String accept); - @Attribute + @Attribute(description = @Description("a comma-separated list of content types to accept, " + + "may not be supported by the browser. E.g. \"images/png,images/jpg\",\"images/*\".")) public abstract String getAccept(); + + @Attribute(description = @Description("this value binding receives the file's content type (optional).")) + public abstract Object getData(); + + @Attribute(description = @Description("the property to receive the contentType")) + public abstract String getContentType(); + + @Attribute(description = @Description("this value binding receives the filename (optional).")) + public abstract String getFileName(); + + @Attribute(description = @Description("this value binding receives the file size (optional).")) + public abstract Integer getFileSize(); @Attribute public abstract String getStyleClass(); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -46,7 +46,7 @@ family="org.jboss.seam.ui.FormattedText", type="org.jboss.seam.ui.FormattedText",generate="org.jboss.seam.ui.component.html.HtmlFormattedText", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="formattedText"), renderer = @JsfRenderer(type="org.jboss.seam.ui.FormattedTextRenderer", family="org.jboss.seam.ui.FormattedTextRenderer"), -attributes = {"formattedText.xml" }) +attributes = {"javax.faces.component.UIOutput.xml" }) public abstract class UIFormattedText extends UIOutput { Log log = Logging.getLog(UIFormattedText.class); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILabel.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILabel.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILabel.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -4,6 +4,7 @@ import javax.faces.component.UIComponent; import javax.faces.component.html.HtmlOutputLabel; +import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.Description; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Tag; @@ -17,7 +18,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Label&quot;,value=&quot;A label associated with the nearest JSF input component."), family="javax.faces.Output", type="org.jboss.seam.ui.Label",generate="org.jboss.seam.ui.component.html.HtmlLabel", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="label"), -attributes = {"label.xml" }) +attributes = {"javax.faces.component.UIOutput.xml", "accesskey-props.xml", "focus-props.xml" }) public abstract class UILabel extends HtmlOutputLabel implements UIDecorateAware { protected UIDecorate decorate; @@ -75,6 +76,7 @@ } @Override + @Attribute(description = @Description("Id of input component this label is for")) public String getFor() { if(decorate != null) { Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -37,7 +37,7 @@ family="org.jboss.seam.ui.Link", type="org.jboss.seam.ui.Link",generate="org.jboss.seam.ui.component.html.HtmlLink", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="link"), renderer = @JsfRenderer(type="org.jboss.seam.ui.LinkRenderer",family="org.jboss.seam.ui.LinkRenderer"), -attributes = {"command-button-props.xml", "javax.faces.component.UICommand.xml", "javax.faces.component.ValueHolder.xml", "i18n-props.xml", "accesskey-props.xml", "button.xml" }) +attributes = {"command-button-props.xml", "javax.faces.component.UICommand.xml", "javax.faces.component.ValueHolder.xml", "i18n-props.xml", "accesskey-props.xml"}) public abstract class UILink extends UISeamCommandBase { @Attribute @@ -54,5 +54,33 @@ public abstract boolean isDisabled(); public abstract void setDisabled(boolean disabled); - + + @Attribute(description = @Description("the JSF view id to link to.")) + public abstract String getView(); + + @Attribute(description = @Description("a pageflow definition to begin. (This is only useful when propagation=\"begin\" or propagation=\"join\".)")) + public abstract String getPageflow(); + + @Attribute(defaultValue = "default", + description = @Description("determines the conversation propagation style: begin, join, nest, none, end or endRoot.")) + public abstract String getPropagation(); + + @Attribute(description = @Description("the fragment identifier to link to.")) + public abstract String getFragment(); + + @Attribute + public abstract String getOutcome(); + + @Attribute + public abstract String getImage(); + + @Attribute(description = @Description("Specify the task to operate on (e.g. for @StartTask)")) + public abstract Object getTaskInstance(); + + @Attribute(description = @Description("The name of the conversation for natural conversations")) + public abstract String getConversationName(); + + @Attribute(defaultValue = "true", + description = @Description("Include page parameters defined in pages.xml when rendering the button")) + public abstract boolean isIncludePageParams(); } Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIMessage.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIMessage.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIMessage.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -37,7 +37,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Message&quot;,value=&quot;Decorate a JSF input field with the validation error message."), family="javax.faces.Message", type="org.jboss.seam.ui.Message",generate="org.jboss.seam.ui.component.html.HtmlMessage", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="message"), -attributes = {"message.xml" }) +attributes = {"javax.faces.component.UIMessage.xml" }) public abstract class UIMessage extends HtmlMessage implements UIDecorateAware { protected UIDecorate decorate; Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIRemote.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIRemote.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIRemote.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -17,11 +17,11 @@ family="org.jboss.seam.ui.Remote", type="org.jboss.seam.ui.Remote",generate="org.jboss.seam.ui.component.html.HtmlRemote", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="remote"), renderer = @JsfRenderer(type="org.jboss.seam.ui.RemoteRenderer", family="org.jboss.seam.ui.RemoteRenderer"), -attributes = {"remote.xml" }) +attributes = {"javax.faces.component.UIComponent.xml", "core-props.xml" }) public abstract class UIRemote extends UIComponentBase { - @Attribute + @Attribute(description = @Description("The Seam components to include in the Seam Remoting JS interface stubs")) public abstract String getInclude(); public abstract void setInclude(String include); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -20,27 +20,26 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Resource&quot;,value=&quot;Given a data in form of an inputstream, java.util.File or byte[] and a content-type, this tag sends the data to the browser"), family="org.jboss.seam.ui.Resource", type="org.jboss.seam.ui.Resource",generate="org.jboss.seam.ui.component.html.HtmlResource", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="resource"), -renderer = @JsfRenderer(type="org.jboss.seam.ui.ResourceRenderer", family="org.jboss.seam.ui.ResourceRenderer"), -attributes = {"resource.xml" }) +renderer = @JsfRenderer(type="org.jboss.seam.ui.ResourceRenderer", family="org.jboss.seam.ui.ResourceRenderer")) public abstract class UIResource extends UIComponentBase { - @Attribute + @Attribute(description = @Description("Inputstream, File or byte[].")) public abstract Object getData(); public abstract void setData(Object data); - @Attribute + @Attribute(description = @Description("Content-type of given data")) public abstract String getContentType(); public abstract void setContentType(String contentType); - @Attribute + @Attribute(description = @Description("Content-Disposition for file (default: inline)")) public abstract String getDisposition(); public abstract void setDisposition(String disposition); - @Attribute + @Attribute(description = @Description("file name to send to browser (default: name of view)")) public abstract String getFileName(); public abstract void setFileName(String fileName); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -18,10 +18,7 @@ import org.jboss.seam.framework.Query; import org.jboss.seam.ui.converter.ConverterChain; import org.jboss.seam.ui.converter.NoSelectionConverter; -import org.richfaces.cdk.annotations.Attribute; -import org.richfaces.cdk.annotations.Description; -import org.richfaces.cdk.annotations.JsfComponent; -import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.*; /** @@ -33,7 +30,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.SelectItems&quot;,value=&quot;Creates a List<SelectItem> from a List, Set, DataModel or Array."), family="javax.faces.SelectItems", type="org.jboss.seam.ui.SelectItems",generate="org.jboss.seam.ui.component.html.HtmlSelectItems", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="selectItems"), -attributes = {"selectItems.xml" }) +attributes = {"base-props.xml", "javax.faces.component.UICommand.xml", "javax.faces.component.UIComponent.xml" }) public abstract class UISelectItems extends javax.faces.component.UISelectItems { private List<javax.faces.model.SelectItem> selectItems; @@ -113,7 +110,9 @@ /* Kinder impl of get/setLabel */ private String label; - + + @Attribute(aliases = {@Alias("itemLabel")}, + description = @Description("the label to be used when rendering the SelectItem. Can reference the var variable")) public String getLabel() { ValueExpression ve = getValueExpression("label"); @@ -136,30 +135,35 @@ public abstract void setHideNoSelectionLabel(Boolean hideNoSelectionLabel); - @Attribute + @Attribute(defaultValue = "false", + description = @Description("if true, the noSelectionLabel will be hidden when a value is selected")) public abstract Boolean isHideNoSelectionLabel(); - @Attribute + @Attribute(description = @Description("specifies the (optional) label to place at the top of list " + + "(if required=\"true\" is also specified then selecting this value will cause a validation error)")) public abstract String getNoSelectionLabel(); public abstract void setNoSelectionLabel(String noSelectionLabel); - @Attribute + @Attribute(description = @Description("defines the name of the local variable that holds the current object during iteration")) public abstract String getVar(); public abstract void setVar(String var); - @Attribute + @Attribute(aliases = {@Alias("itemDisabled")}, + description = @Description("if true the SelectItem will be rendered disabled. Can reference the var variable")) public abstract Boolean isDisabled(); public abstract void setDisabled(Boolean disabled); - @Attribute + @Attribute(defaultValue = "true", description = @Description("if false, characters in the label will not be escaped. " + + "Beware that this is a safety issue when the label is in any way derived from input supplied by the application's user. . Can reference the var variable")) public abstract Boolean isEscape(); public abstract void setEscape(Boolean escape); - @Attribute + @Attribute(description = @Description("Value to return to the server if this option is selected. " + + "Optional, by default the var object is used. Can reference the var variable")) public abstract Object getItemValue(); public abstract void setItemValue(Object itemValue); @@ -178,6 +182,7 @@ } @Override + @Attribute(description = @Description("an EL expression specifying the data that backs the List&lt;SelectItem&gt;")) public Object getValue() { List<javax.faces.model.SelectItem> temporarySelectItems = new ArrayList<javax.faces.model.SelectItem>(); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -38,7 +38,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Selection&quot;, value="It inserts a parameter that can be bound to a data model"), family="org.jboss.seam.ui.Selection", type="org.jboss.seam.ui.Selection",generate="org.jboss.seam.ui.component.html.HtmlSelection", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="selection"), -attributes = {"selection.xml" }) +attributes = {"javax.faces.component.UIComponent.xml" }) public abstract class UISelection extends UIParameter { private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Selection"; Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -15,11 +15,11 @@ family="org.jboss.seam.ui.Span", type="org.jboss.seam.ui.Span",generate="org.jboss.seam.ui.component.html.HtmlSpan", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="span"), renderer = @JsfRenderer(type="org.jboss.seam.ui.SpanRenderer", family="org.jboss.seam.ui.SpanRenderer"), -attributes = {"core-props.xml", "span.xml"}) +attributes = {"core-props.xml", "javax.faces.component.UIComponent.xml"}) public abstract class UISpan extends UIStyle { - @Attribute + @Attribute(description = @Description("Span title attribute")) public abstract String getTitle(); public abstract void setTitle(String title); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -70,7 +70,7 @@ family="org.jboss.seam.ui.Token", type="org.jboss.seam.ui.Token",generate="org.jboss.seam.ui.component.html.HtmlToken", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="token"), renderer = @JsfRenderer(type="org.jboss.seam.ui.TokenRenderer", family="org.jboss.seam.ui.TokenRenderer"), -attributes = {"token.xml" }) +attributes = {"javax.faces.component.UIComponent.xml" }) public abstract class UIToken extends UIOutput { @SuppressWarnings("unused") @@ -85,7 +85,8 @@ * if the "build before restore" mode of Facelets is activated (the * default in JSF 2.0). The default value is false. */ - @Attribute + @Attribute(defaultValue = "false", + description = @Description("A flag indicating whether the session id should be tied into the secure token.")) public abstract boolean isRequireSession(); public abstract void setRequireSession(boolean required); @@ -96,7 +97,8 @@ * enabled, present a notice to the user that form posts will not work. * The default value is false. */ - @Attribute + @Attribute(defaultValue = "false", + description = @Description("A flag indicating whether a notice should be presented to the user if cookies are disabled.")) public abstract boolean isEnableCookieNotice(); public abstract void setEnableCookieNotice(boolean state); @@ -109,7 +111,8 @@ * have the UIToken component rerendered on any Ajax call where the UIToken * component would be processed. The default value is false. */ - @Attribute + @Attribute(defaultValue = "false", + description = @Description("A flag indicating whether the form can be submitted multiple times with the same signature (i.e., token).")) public abstract boolean isAllowMultiplePosts(); public abstract void setAllowMultiplePosts(boolean allow); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -17,13 +17,13 @@ family="org.jboss.seam.ui.graphicImage.GraphicImage", type="org.jboss.seam.ui.graphicImage.GraphicImage",generate="org.jboss.seam.ui.component.html.HtmlGraphicImage", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="graphicImage"), renderer = @JsfRenderer(type="org.jboss.seam.ui.graphicImage.GraphicImageRenderer", family="org.jboss.seam.ui.GraphicImageRenderer"), -attributes = {"core-props.xml", "javax.faces.component.UIGraphic.xml", "javax.faces.component.UIOutput.xml", "graphicImage.xml" }) +attributes = {"core-props.xml", "javax.faces.component.UIGraphic.xml", "javax.faces.component.UIOutput.xml" }) public abstract class UIGraphicImage extends HtmlGraphicImage { public static final String FAMILY = "org.jboss.seam.ui.UIGraphicImage"; - @Attribute + @Attribute(description = @Description("File name for the generated URL - allows a stable file name and thus browser caching")) public abstract String getFileName(); @Attribute Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -17,8 +17,7 @@ */ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.graphicImage.TransformImageBlur&quot;,value=&quot;Nested in a s:graphicImage. Transform an image by applying a blur."), family="org.jboss.seam.ui.graphicImage.TransformImageBlur", type="org.jboss.seam.ui.graphicImage.TransformImageBlur",generate="org.jboss.seam.ui.component.html.HtmlTransformImageBlur", -tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageBlur"), -attributes = {"transformImageBlur.xml" }) +tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageBlur")) public abstract class UITransformImageBlur extends UIComponentBase implements ImageTransform { @@ -31,7 +30,7 @@ image.blur(new Integer(getRadius())); } - @Attribute + @Attribute(description = @Description("The radius of the blur (essentially the amount of blur)")) public abstract String getRadius(); public abstract void setRadius(String width); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -18,8 +18,7 @@ */ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.graphicImage.TransformImageSize&quot;,value=&quot;Nested in a s:graphicImage. Transform an image by altering the size."), family="org.jboss.seam.ui.graphicImage.TransformImageSize", type="org.jboss.seam.ui.graphicImage.TransformImageSize",generate="org.jboss.seam.ui.component.html.HtmlTransformImageSize", -tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageSize"), -attributes = {"transformImageSize.xml" }) +tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageSize")) public abstract class UITransformImageSize extends UIComponentBase implements ImageTransform { @@ -66,22 +65,23 @@ } } - @Attribute + @Attribute(description = @Description("If true, don't alter the ratio of the image. In this case only height or width should be specificed.")) public abstract boolean isMaintainRatio(); public abstract void setMaintainRatio(boolean maintainRatio); - @Attribute + @Attribute(description = @Description("The new width of the image")) public abstract Integer getWidth(); public abstract void setWidth(Integer width); - @Attribute + @Attribute(description = @Description("The new height of the image")) public abstract Integer getHeight(); public abstract void setHeight(Integer height); - @Attribute + @Attribute(description = @Description("Change the size of the image by a fraction. If factor is specified, " + + "height, width and maintainRatio should not be specified")) public abstract Double getFactor(); public abstract void setFactor(Double factor); Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java 2012-11-20 13:25:05 UTC (rev 15365) +++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java 2012-11-20 13:47:11 UTC (rev 15366) @@ -17,8 +17,7 @@ */ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.graphicImage.TransformImageType&quot;,value=&quot;Nested in a s:graphicImage. Transform an image by changing it's type."), family="org.jboss.seam.ui.graphicImage.TransformImageType", type="org.jboss.seam.ui.graphicImage.TransformImageType",generate="org.jboss.seam.ui.component.html.HtmlTransformImageType", -tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageType"), -attributes = {"transformImageType.xml" }) +tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="transformImageType")) public abstract class UITransformImageType extends UIComponentBase implements ImageTransform { @@ -35,7 +34,7 @@ } } - @Attribute + @Attribute(description = @Description("The mime type of the output image")) public abstract String getContentType(); public abstract void setContentType(String width);